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.88 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC

… …
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450 450
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
… …
485 OUTPUT: 485 OUTPUT:
486 RETVAL 486 RETVAL
487 487
488void 488void
489SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
490 493
491void 494void
492SDL_PollEvent () 495SDL_PollEvent ()
493 PPCODE: 496 PPCODE:
494{ 497{
… …
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 518 break;
516 519
517 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 528 break;
524 529
525 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 538 break;
… …
557lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
558 CODE: 565 CODE:
559#ifndef _WIN32 566#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 568#endif
562
563char *
564gl_version ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_extensions ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_EXTENSIONS);
574 OUTPUT:
575 RETVAL
576 569
577void 570void
578add_font (char *file) 571add_font (char *file)
579 CODE: 572 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
717 710
718CFClient::Layout 711CFClient::Layout
719new (SV *class, int rgba = 0) 712new (SV *class, int rgba = 0)
720 CODE: 713 CODE:
721#if _WIN32 714#if _WIN32
722 rgba = 0;//D 715 //rgba = 0;//D make stext nicer, breaks TextView
723#endif 716#endif
724 New (0, RETVAL, 1, struct cf_layout); 717 New (0, RETVAL, 1, struct cf_layout);
725 718
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727 RETVAL->rgba = rgba; 720 RETVAL->rgba = rgba;
… …
974{ 967{
975 HV *hv = (HV *)SvRV (self); 968 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 969 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 970 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 971 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 972
981 if (items < 5) 973 if (items < 5)
982 { 974 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 975 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 976 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
991 glEnable (GL_ALPHA_TEST); 983 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 984 glAlphaFunc (GL_GREATER, 0.01f);
993 } 985 }
994 986
995 glBindTexture (GL_TEXTURE_2D, name); 987 glBindTexture (GL_TEXTURE_2D, name);
996
997 if (wrap_mode)
998 {
999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001 }
1002 988
1003 glBegin (GL_QUADS); 989 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 990 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 991 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 992 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
… …
1083 tex->r = r; 1069 tex->r = r;
1084 tex->g = g; 1070 tex->g = g;
1085 tex->b = b; 1071 tex->b = b;
1086 tex->a = a; 1072 tex->a = a;
1087 } 1073 }
1074
1075 // somewhat hackish, but for textures that require it, it really
1076 // improves the look, and most others don't suffer.
1077 glBindTexture (GL_TEXTURE_2D, name);
1078 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1080 // use uglier nearest interpolation because linear suffers
1081 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088} 1083}
1089 1084
1090int 1085int
1091ox (CFClient::Map self) 1086ox (CFClient::Map self)
1092 ALIAS: 1087 ALIAS:
1093 oy = 1 1088 oy = 1
1089 x = 2
1090 y = 3
1091 w = 4
1092 h = 5
1094 CODE: 1093 CODE:
1095 switch (ix) 1094 switch (ix)
1096 { 1095 {
1097 case 0: RETVAL = self->ox; break; 1096 case 0: RETVAL = self->ox; break;
1098 case 1: RETVAL = self->oy; break; 1097 case 1: RETVAL = self->oy; break;
1098 case 2: RETVAL = self->x; break;
1099 case 3: RETVAL = self->y; break;
1100 case 4: RETVAL = self->w; break;
1101 case 5: RETVAL = self->h; break;
1099 } 1102 }
1100 OUTPUT: 1103 OUTPUT:
1101 RETVAL 1104 RETVAL
1102 1105
1103void 1106void
… …
1530 const_iv (GL_COLOR_MATERIAL), 1533 const_iv (GL_COLOR_MATERIAL),
1531 const_iv (GL_SMOOTH), 1534 const_iv (GL_SMOOTH),
1532 const_iv (GL_FLAT), 1535 const_iv (GL_FLAT),
1533 const_iv (GL_DITHER), 1536 const_iv (GL_DITHER),
1534 const_iv (GL_BLEND), 1537 const_iv (GL_BLEND),
1538 const_iv (GL_CULL_FACE),
1535 const_iv (GL_SCISSOR_TEST), 1539 const_iv (GL_SCISSOR_TEST),
1540 const_iv (GL_DEPTH_TEST),
1541 const_iv (GL_ALPHA_TEST),
1542 const_iv (GL_NORMALIZE),
1543 const_iv (GL_RESCALE_NORMAL),
1536 const_iv (GL_AND), 1544 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1545 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1546 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1547 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1548 const_iv (GL_SRC_ALPHA_SATURATE),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1549 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1550 const_iv (GL_ONE_MINUS_DST_ALPHA),
1543 const_iv (GL_RGB), 1551 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1552 const_iv (GL_RGBA),
1545 const_iv (GL_UNSIGNED_BYTE), 1553 const_iv (GL_UNSIGNED_BYTE),
1554 const_iv (GL_UNSIGNED_SHORT),
1555 const_iv (GL_UNSIGNED_INT),
1546 const_iv (GL_ALPHA), 1556 const_iv (GL_ALPHA),
1547 const_iv (GL_INTENSITY), 1557 const_iv (GL_INTENSITY),
1548 const_iv (GL_LUMINANCE), 1558 const_iv (GL_LUMINANCE),
1549 const_iv (GL_LUMINANCE_ALPHA), 1559 const_iv (GL_LUMINANCE_ALPHA),
1550 const_iv (GL_FLOAT), 1560 const_iv (GL_FLOAT),
… …
1556 const_iv (GL_TEXTURE_MAG_FILTER), 1566 const_iv (GL_TEXTURE_MAG_FILTER),
1557 const_iv (GL_TEXTURE_MIN_FILTER), 1567 const_iv (GL_TEXTURE_MIN_FILTER),
1558 const_iv (GL_TEXTURE_ENV_MODE), 1568 const_iv (GL_TEXTURE_ENV_MODE),
1559 const_iv (GL_TEXTURE_WRAP_S), 1569 const_iv (GL_TEXTURE_WRAP_S),
1560 const_iv (GL_TEXTURE_WRAP_T), 1570 const_iv (GL_TEXTURE_WRAP_T),
1571 const_iv (GL_REPEAT),
1561 const_iv (GL_CLAMP), 1572 const_iv (GL_CLAMP),
1562 const_iv (GL_REPEAT), 1573 const_iv (GL_CLAMP_TO_EDGE),
1563 const_iv (GL_NEAREST), 1574 const_iv (GL_NEAREST),
1564 const_iv (GL_LINEAR), 1575 const_iv (GL_LINEAR),
1565 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1576 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1566 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1577 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1567 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1578 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1568 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1579 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1569 const_iv (GL_GENERATE_MIPMAP), 1580 const_iv (GL_GENERATE_MIPMAP),
1570 const_iv (GL_MODULATE), 1581 const_iv (GL_MODULATE),
1571 const_iv (GL_DECAL), 1582 const_iv (GL_DECAL),
1572 const_iv (GL_REPLACE), 1583 const_iv (GL_REPLACE),
1584 const_iv (GL_DEPTH_BUFFER_BIT),
1573 const_iv (GL_COLOR_BUFFER_BIT), 1585 const_iv (GL_COLOR_BUFFER_BIT),
1574 const_iv (GL_PROJECTION), 1586 const_iv (GL_PROJECTION),
1575 const_iv (GL_MODELVIEW), 1587 const_iv (GL_MODELVIEW),
1576 const_iv (GL_COLOR_LOGIC_OP), 1588 const_iv (GL_COLOR_LOGIC_OP),
1577 const_iv (GL_SEPARABLE_2D), 1589 const_iv (GL_SEPARABLE_2D),
1578 const_iv (GL_CONVOLUTION_2D), 1590 const_iv (GL_CONVOLUTION_2D),
1579 const_iv (GL_CONVOLUTION_BORDER_MODE), 1591 const_iv (GL_CONVOLUTION_BORDER_MODE),
1580 const_iv (GL_CONSTANT_BORDER), 1592 const_iv (GL_CONSTANT_BORDER),
1581 const_iv (GL_LINES), 1593 const_iv (GL_LINES),
1594 const_iv (GL_LINE_LOOP),
1582 const_iv (GL_QUADS), 1595 const_iv (GL_QUADS),
1583 const_iv (GL_LINE_LOOP), 1596 const_iv (GL_QUAD_STRIP),
1597 const_iv (GL_TRIANGLES),
1598 const_iv (GL_TRIANGLE_STRIP),
1599 const_iv (GL_TRIANGLE_FAN),
1584 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1600 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1585 const_iv (GL_FASTEST), 1601 const_iv (GL_FASTEST),
1602 const_iv (GL_V2F),
1603 const_iv (GL_V3F),
1604 const_iv (GL_T2F_V3F),
1605 const_iv (GL_T2F_N3F_V3F),
1586# undef const_iv 1606# undef const_iv
1587 }; 1607 };
1588 1608
1589 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1609 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1590 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1591} 1611}
1592 1612
1613char *
1614gl_vendor ()
1615 CODE:
1616 RETVAL = (char *)glGetString (GL_VENDOR);
1617 OUTPUT:
1618 RETVAL
1619
1620char *
1621gl_version ()
1622 CODE:
1623 RETVAL = (char *)glGetString (GL_VERSION);
1624 OUTPUT:
1625 RETVAL
1626
1627char *
1628gl_extensions ()
1629 CODE:
1630 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1631 OUTPUT:
1632 RETVAL
1633
1593int glGetError () 1634int glGetError ()
1594 1635
1595void glClear (int mask) 1636void glClear (int mask)
1596 1637
1597void glClearColor (float r, float g, float b, float a = 1.0) 1638void glClearColor (float r, float g, float b, float a = 1.0)
… …
1605 1646
1606void glHint (int target, int mode) 1647void glHint (int target, int mode)
1607 1648
1608void glBlendFunc (int sfactor, int dfactor) 1649void glBlendFunc (int sfactor, int dfactor)
1609 1650
1651void glDepthMask (int flag)
1652
1610void glLogicOp (int opcode) 1653void glLogicOp (int opcode)
1611 1654
1612void glColorMask (int red, int green, int blue, int alpha) 1655void glColorMask (int red, int green, int blue, int alpha)
1613 1656
1614void glMatrixMode (int mode) 1657void glMatrixMode (int mode)
… …
1617 1660
1618void glPopMatrix () 1661void glPopMatrix ()
1619 1662
1620void glLoadIdentity () 1663void glLoadIdentity ()
1621 1664
1622# near and far are due to microsofts buggy c compiler 1665# near_ and far_ are due to microsofts buggy "c" compiler
1666void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1667
1668# near_ and far_ are due to microsofts buggy "c" compiler
1623void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1669void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1624 1670
1625void glViewport (int x, int y, int width, int height) 1671void glViewport (int x, int y, int width, int height)
1626 1672
1627void glScissor (int x, int y, int width, int height) 1673void glScissor (int x, int y, int width, int height)
… …
1643void glEnd () 1689void glEnd ()
1644 1690
1645void glColor (float r, float g, float b, float a = 1.0) 1691void glColor (float r, float g, float b, float a = 1.0)
1646 PROTOTYPE: @ 1692 PROTOTYPE: @
1647 CODE: 1693 CODE:
1694 // microsoft visual "c" rounds instead of truncating...
1648 glColor4ub (MIN ((int)(r * 255.f), 255), 1695 glColor4ub (MIN ((int)(r * 256.f), 255),
1649 MIN ((int)(g * 255.f), 255), 1696 MIN ((int)(g * 256.f), 255),
1650 MIN ((int)(b * 255.f), 255), 1697 MIN ((int)(b * 256.f), 255),
1651 MIN ((int)(a * 255.f), 255)); 1698 MIN ((int)(a * 256.f), 255));
1699
1700void glInterleavedArrays (int format, int stride, char *data)
1701
1702void glDrawElements (int mode, int count, int type, char *indices)
1703
1704# 1.2 void glDrawRangeElements (int mode, int start, int end
1705
1706void glRasterPos (float x, float y, float z = 0.)
1707 CODE:
1708 glRasterPos3f (0, 0, z);
1709 glBitmap (0, 0, 0, 0, x, y, 0);
1652 1710
1653void glVertex (float x, float y, float z = 0.) 1711void glVertex (float x, float y, float z = 0.)
1654 CODE: 1712 CODE:
1655 glVertex3f (x, y, z); 1713 glVertex3f (x, y, z);
1656 1714
… …
1684 1742
1685void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1743void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1686 1744
1687void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1745void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1688 1746
1689void glRasterPos (int x, int y) 1747void glDrawPixels (int width, int height, int format, int type, char *pixels)
1690 CODE:
1691 glRasterPos2i (x, y);
1692 1748
1693void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1749void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1694 1750
1695int glGenTexture () 1751int glGenTexture ()
1696 CODE: 1752 CODE:
… …
1723 1779
1724void glEndList () 1780void glEndList ()
1725 1781
1726void glCallList (int list) 1782void glCallList (int list)
1727 1783
1784

Diff Legend

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