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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC

… …
7 7
8#include "EXTERN.h" 8#include "EXTERN.h"
9#include "perl.h" 9#include "perl.h"
10#include "XSUB.h" 10#include "XSUB.h"
11 11
12#include <math.h>
12#include <string.h> 13#include <string.h>
13#include <stdio.h> 14#include <stdio.h>
14 15
15#include <SDL.h> 16#include <SDL.h>
16#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
83 84
84static void 85static void
85substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
86{ 87{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
89} 94}
90 95
91static void 96static void
92layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
93{ 98{
… …
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 455
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
451 457
452 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 460
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
464 470
465 ++m; 471 ++m;
466 } 472 }
467} 473}
468 474
475char *
476SDL_GetError ()
477
469int 478int
470SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 480 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
473 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
482void 491void
483SDL_PollEvent () 492SDL_PollEvent ()
484 PPCODE: 493 PPCODE:
485{ 494{
486 SDL_Event ev; 495 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
487 508
488 while (SDL_PollEvent (&ev)) 509 while (SDL_PollEvent (&ev))
489 { 510 {
490 HV *hv = newHV (); 511 HV *hv = newHV ();
491 hv_store (hv, "type", 4, newSViv (ev.type), 0); 512 hv_store (hv, "type", 4, newSViv (ev.type), 0);
492 513
493 switch (ev.type) 514 switch (ev.type)
494 { 515 {
495 case SDL_KEYDOWN: 516 case SDL_KEYDOWN:
496 case SDL_KEYUP: 517 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
497 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
498 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
499 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
500 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
501 break; 533 break;
… …
504 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506 break; 538 break;
507 539
508 case SDL_MOUSEMOTION: 540 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0);
542
509 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514 break; 548 break;
515 549
516 case SDL_MOUSEBUTTONDOWN: 550 case SDL_MOUSEBUTTONDOWN:
517 case SDL_MOUSEBUTTONUP: 551 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0);
553
518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break; 558 break;
… …
548lowdelay (int fd, int val = 1) 584lowdelay (int fd, int val = 1)
549 CODE: 585 CODE:
550#ifndef _WIN32 586#ifndef _WIN32
551 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552#endif 588#endif
589
590char *
591gl_vendor ()
592 CODE:
593 RETVAL = (char *)glGetString (GL_VENDOR);
594 OUTPUT:
595 RETVAL
553 596
554char * 597char *
555gl_version () 598gl_version ()
556 CODE: 599 CODE:
557 RETVAL = (char *)glGetString (GL_VERSION); 600 RETVAL = (char *)glGetString (GL_VERSION);
… …
664} 707}
665 708
666void 709void
667error (char *message) 710error (char *message)
668 CODE: 711 CODE:
712 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 713#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 714 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 715#endif
674 716
675void 717void
676fatal (char *message) 718fatal (char *message)
677 CODE: 719 CODE:
720 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 721#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 722 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 723#endif
683 exit (1); 724 exit (1);
684 725
685MODULE = CFClient PACKAGE = CFClient::Font 726MODULE = CFClient PACKAGE = CFClient::Font
686 727
… …
709MODULE = CFClient PACKAGE = CFClient::Layout 750MODULE = CFClient PACKAGE = CFClient::Layout
710 751
711CFClient::Layout 752CFClient::Layout
712new (SV *class, int rgba = 0) 753new (SV *class, int rgba = 0)
713 CODE: 754 CODE:
755#if _WIN32
756 rgba = 0;//D
757#endif
714 New (0, RETVAL, 1, struct cf_layout); 758 New (0, RETVAL, 1, struct cf_layout);
715 759
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
717 RETVAL->rgba = rgba; 761 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 762 RETVAL->r = 1.;
… …
798set_width (CFClient::Layout self, int max_width = -1) 842set_width (CFClient::Layout self, int max_width = -1)
799 CODE: 843 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 844 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801 845
802void 846void
847set_indent (CFClient::Layout self, int indent)
848 CODE:
849 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850
851void
852set_spacing (CFClient::Layout self, int spacing)
853 CODE:
854 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855
856void
857set_ellipsise (CFClient::Layout self, int ellipsise)
858 CODE:
859 pango_layout_set_ellipsize (self->pl,
860 ellipsise == 1 ? PANGO_ELLIPSIZE_START
861 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
863 : PANGO_ELLIPSIZE_NONE
864 );
865
866void
867set_single_paragraph_mode (CFClient::Layout self, int spm)
868 CODE:
869 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870
871void
803size (CFClient::Layout self) 872size (CFClient::Layout self)
804 PPCODE: 873 PPCODE:
805{ 874{
806 int w, h; 875 int w, h;
807 876
… …
873 942
874 while (p < e) 943 while (p < e)
875 { 944 {
876 uint32_t rgba = *p; 945 uint32_t rgba = *p;
877 rgba = (rgba >> 24) | (rgba << 8); 946 rgba = (rgba >> 24) | (rgba << 8);
947#if 0
948#ifdef _WIN32
949 {//D
950 uint8_t r = rgba >> 24;
951 uint8_t g = rgba >> 16;
952 uint8_t b = rgba >> 8;
953 uint8_t a = rgba >> 0;
954
955 rgba = (rgba & 0xffffff00) | a;
956 }
957#endif
958#endif
878 rgba = SDL_SwapBE32 (rgba); 959 rgba = SDL_SwapBE32 (rgba);
879 *p++ = rgba; 960 *p++ = rgba;
880 } 961 }
881 } 962 }
882 963
… …
939 1020
940 if (ix) 1021 if (ix)
941 { 1022 {
942 glEnable (GL_BLEND); 1023 glEnable (GL_BLEND);
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1024 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1025 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f);
944 } 1027 }
945 1028
946 glBindTexture (GL_TEXTURE_2D, name); 1029 glBindTexture (GL_TEXTURE_2D, name);
947 1030
948 if (wrap_mode) 1031 if (wrap_mode)
… …
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1041 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1042 glEnd ();
960 1043
961 if (ix) 1044 if (ix)
1045 {
1046 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1047 glDisable (GL_BLEND);
1048 }
963} 1049}
964 1050
965MODULE = CFClient PACKAGE = CFClient::Map 1051MODULE = CFClient PACKAGE = CFClient::Map
966 1052
967CFClient::Map 1053CFClient::Map
… …
1478 const_iv (GL_COLOR_MATERIAL), 1564 const_iv (GL_COLOR_MATERIAL),
1479 const_iv (GL_SMOOTH), 1565 const_iv (GL_SMOOTH),
1480 const_iv (GL_FLAT), 1566 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER), 1567 const_iv (GL_DITHER),
1482 const_iv (GL_BLEND), 1568 const_iv (GL_BLEND),
1569 const_iv (GL_CULL_FACE),
1483 const_iv (GL_SCISSOR_TEST), 1570 const_iv (GL_SCISSOR_TEST),
1571 const_iv (GL_DEPTH_TEST),
1572 const_iv (GL_ALPHA_TEST),
1573 const_iv (GL_NORMALIZE),
1574 const_iv (GL_RESCALE_NORMAL),
1484 const_iv (GL_AND), 1575 const_iv (GL_AND),
1485 const_iv (GL_ONE), 1576 const_iv (GL_ONE),
1486 const_iv (GL_ZERO), 1577 const_iv (GL_ZERO),
1487 const_iv (GL_SRC_ALPHA), 1578 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE), 1579 const_iv (GL_SRC_ALPHA_SATURATE),
1489 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1580 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1581 const_iv (GL_ONE_MINUS_DST_ALPHA),
1491 const_iv (GL_RGB), 1582 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1583 const_iv (GL_RGBA),
1493 const_iv (GL_UNSIGNED_BYTE), 1584 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT),
1494 const_iv (GL_ALPHA), 1587 const_iv (GL_ALPHA),
1588 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1589 const_iv (GL_LUMINANCE),
1590 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1591 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1593 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1594 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1595 const_iv (GL_TEXTURE_2D),
… …
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1609 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP), 1610 const_iv (GL_GENERATE_MIPMAP),
1516 const_iv (GL_MODULATE), 1611 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL), 1612 const_iv (GL_DECAL),
1518 const_iv (GL_REPLACE), 1613 const_iv (GL_REPLACE),
1614 const_iv (GL_DEPTH_BUFFER_BIT),
1519 const_iv (GL_COLOR_BUFFER_BIT), 1615 const_iv (GL_COLOR_BUFFER_BIT),
1520 const_iv (GL_PROJECTION), 1616 const_iv (GL_PROJECTION),
1521 const_iv (GL_MODELVIEW), 1617 const_iv (GL_MODELVIEW),
1522 const_iv (GL_COLOR_LOGIC_OP), 1618 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D), 1619 const_iv (GL_SEPARABLE_2D),
1524 const_iv (GL_CONVOLUTION_2D), 1620 const_iv (GL_CONVOLUTION_2D),
1525 const_iv (GL_CONVOLUTION_BORDER_MODE), 1621 const_iv (GL_CONVOLUTION_BORDER_MODE),
1526 const_iv (GL_CONSTANT_BORDER), 1622 const_iv (GL_CONSTANT_BORDER),
1527 const_iv (GL_LINES), 1623 const_iv (GL_LINES),
1624 const_iv (GL_LINE_LOOP),
1528 const_iv (GL_QUADS), 1625 const_iv (GL_QUADS),
1529 const_iv (GL_LINE_LOOP), 1626 const_iv (GL_QUAD_STRIP),
1627 const_iv (GL_TRIANGLES),
1628 const_iv (GL_TRIANGLE_STRIP),
1629 const_iv (GL_TRIANGLE_FAN),
1530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1630 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531 const_iv (GL_FASTEST), 1631 const_iv (GL_FASTEST),
1632 const_iv (GL_V2F),
1633 const_iv (GL_V3F),
1634 const_iv (GL_T2F_V3F),
1635 const_iv (GL_T2F_N3F_V3F),
1532# undef const_iv 1636# undef const_iv
1533 }; 1637 };
1534 1638
1535 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1536 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1551 1655
1552void glHint (int target, int mode) 1656void glHint (int target, int mode)
1553 1657
1554void glBlendFunc (int sfactor, int dfactor) 1658void glBlendFunc (int sfactor, int dfactor)
1555 1659
1660void glDepthMask (int flag)
1661
1556void glLogicOp (int opcode) 1662void glLogicOp (int opcode)
1557 1663
1558void glColorMask (int red, int green, int blue, int alpha) 1664void glColorMask (int red, int green, int blue, int alpha)
1559 1665
1560void glMatrixMode (int mode) 1666void glMatrixMode (int mode)
… …
1563 1669
1564void glPopMatrix () 1670void glPopMatrix ()
1565 1671
1566void glLoadIdentity () 1672void glLoadIdentity ()
1567 1673
1568# near and far are due to microsofts buggy c compiler 1674# near_ and far_ are due to microsofts buggy "c" compiler
1675void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676
1677# near_ and far_ are due to microsofts buggy "c" compiler
1569void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1678void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1570 1679
1571void glViewport (int x, int y, int width, int height) 1680void glViewport (int x, int y, int width, int height)
1572 1681
1573void glScissor (int x, int y, int width, int height) 1682void glScissor (int x, int y, int width, int height)
… …
1589void glEnd () 1698void glEnd ()
1590 1699
1591void glColor (float r, float g, float b, float a = 1.0) 1700void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1701 PROTOTYPE: @
1593 CODE: 1702 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1703 // microsoft visual "c" rounds instead of truncating...
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1704 glColor4ub (MIN ((int)(r * 255.f), 255),
1705 MIN ((int)(g * 255.f), 255),
1706 MIN ((int)(b * 255.f), 255),
1707 MIN ((int)(a * 255.f), 255));
1708
1709void glInterleavedArrays (int format, int stride, char *data)
1710
1711void glDrawElements (int mode, int count, int type, char *indices)
1712
1713# 1.2 void glDrawRangeElements (int mode, int start, int end
1714
1715void glRasterPos (float x, float y, float z = 0.)
1716 CODE:
1717 glRasterPos3f (0, 0, z);
1718 glBitmap (0, 0, 0, 0, x, y, 0);
1596 1719
1597void glVertex (float x, float y, float z = 0.) 1720void glVertex (float x, float y, float z = 0.)
1598 CODE: 1721 CODE:
1599 glVertex3f (x, y, z); 1722 glVertex3f (x, y, z);
1600 1723
… …
1628 1751
1629void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1752void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1630 1753
1631void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1754void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1632 1755
1633void glRasterPos (int x, int y) 1756void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634 CODE:
1635 glRasterPos2i (x, y);
1636 1757
1637void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1758void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1638 1759
1639int glGenTexture () 1760int glGenTexture ()
1640 CODE: 1761 CODE:
… …
1667 1788
1668void glEndList () 1789void glEndList ()
1669 1790
1670void glCallList (int list) 1791void glCallList (int list)
1671 1792
1793

Diff Legend

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