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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.99 by root, Mon May 29 02:11:03 2006 UTC

… …
441 SDL_Rect **m; 441 SDL_Rect **m;
442 442
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
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, 16); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 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);
… …
470 470
471 ++m; 471 ++m;
472 } 472 }
473} 473}
474 474
475char *
476SDL_GetError ()
477
475int 478int
476SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 480 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
482 OUTPUT: 485 OUTPUT:
483 RETVAL 486 RETVAL
484 487
485void 488void
486SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
487 493
488void 494void
489SDL_PollEvent () 495SDL_PollEvent ()
490 PPCODE: 496 PPCODE:
491{ 497{
… …
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 518 break;
513 519
514 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 528 break;
521 529
522 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 538 break;
… …
554lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
555 CODE: 565 CODE:
556#ifndef _WIN32 566#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 568#endif
559
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573 569
574void 570void
575add_font (char *file) 571add_font (char *file)
576 CODE: 572 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
713MODULE = CFClient PACKAGE = CFClient::Layout 709MODULE = CFClient PACKAGE = CFClient::Layout
714 710
715CFClient::Layout 711CFClient::Layout
716new (SV *class, int rgba = 0) 712new (SV *class, int rgba = 0)
717 CODE: 713 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
718 New (0, RETVAL, 1, struct cf_layout); 717 New (0, RETVAL, 1, struct cf_layout);
719 718
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
721 RETVAL->rgba = rgba; 720 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 721 RETVAL->r = 1.;
… …
902 901
903 while (p < e) 902 while (p < e)
904 { 903 {
905 uint32_t rgba = *p; 904 uint32_t rgba = *p;
906 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
907 rgba = SDL_SwapBE32 (rgba); 918 rgba = SDL_SwapBE32 (rgba);
908 *p++ = rgba; 919 *p++ = rgba;
909 } 920 }
910 } 921 }
911 922
… …
956{ 967{
957 HV *hv = (HV *)SvRV (self); 968 HV *hv = (HV *)SvRV (self);
958 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 969 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 970 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 971 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962 972
963 if (items < 5) 973 if (items < 5)
964 { 974 {
965 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 975 w = SvNV (*hv_fetch (hv, "w", 1, 1));
966 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 976 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
973 glEnable (GL_ALPHA_TEST); 983 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f); 984 glAlphaFunc (GL_GREATER, 0.01f);
975 } 985 }
976 986
977 glBindTexture (GL_TEXTURE_2D, name); 987 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 988
985 glBegin (GL_QUADS); 989 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 990 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 991 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 992 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
… …
1065 tex->r = r; 1069 tex->r = r;
1066 tex->g = g; 1070 tex->g = g;
1067 tex->b = b; 1071 tex->b = b;
1068 tex->a = a; 1072 tex->a = a;
1069 } 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);
1070} 1083}
1071 1084
1072int 1085int
1073ox (CFClient::Map self) 1086ox (CFClient::Map self)
1074 ALIAS: 1087 ALIAS:
… …
1512 const_iv (GL_COLOR_MATERIAL), 1525 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1526 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1527 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1528 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1529 const_iv (GL_BLEND),
1530 const_iv (GL_CULL_FACE),
1517 const_iv (GL_SCISSOR_TEST), 1531 const_iv (GL_SCISSOR_TEST),
1532 const_iv (GL_DEPTH_TEST),
1533 const_iv (GL_ALPHA_TEST),
1534 const_iv (GL_NORMALIZE),
1535 const_iv (GL_RESCALE_NORMAL),
1518 const_iv (GL_AND), 1536 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1537 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1538 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1539 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1540 const_iv (GL_SRC_ALPHA_SATURATE),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1541 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1542 const_iv (GL_ONE_MINUS_DST_ALPHA),
1525 const_iv (GL_RGB), 1543 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1544 const_iv (GL_RGBA),
1527 const_iv (GL_UNSIGNED_BYTE), 1545 const_iv (GL_UNSIGNED_BYTE),
1546 const_iv (GL_UNSIGNED_SHORT),
1547 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1548 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1549 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1550 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1551 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1552 const_iv (GL_FLOAT),
… …
1538 const_iv (GL_TEXTURE_MAG_FILTER), 1558 const_iv (GL_TEXTURE_MAG_FILTER),
1539 const_iv (GL_TEXTURE_MIN_FILTER), 1559 const_iv (GL_TEXTURE_MIN_FILTER),
1540 const_iv (GL_TEXTURE_ENV_MODE), 1560 const_iv (GL_TEXTURE_ENV_MODE),
1541 const_iv (GL_TEXTURE_WRAP_S), 1561 const_iv (GL_TEXTURE_WRAP_S),
1542 const_iv (GL_TEXTURE_WRAP_T), 1562 const_iv (GL_TEXTURE_WRAP_T),
1563 const_iv (GL_REPEAT),
1543 const_iv (GL_CLAMP), 1564 const_iv (GL_CLAMP),
1544 const_iv (GL_REPEAT), 1565 const_iv (GL_CLAMP_TO_EDGE),
1545 const_iv (GL_NEAREST), 1566 const_iv (GL_NEAREST),
1546 const_iv (GL_LINEAR), 1567 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1568 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1569 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1570 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1571 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1572 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1573 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1574 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1575 const_iv (GL_REPLACE),
1576 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1577 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1578 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1579 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1580 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1581 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1582 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1583 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1584 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1585 const_iv (GL_LINES),
1586 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1587 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP), 1588 const_iv (GL_QUAD_STRIP),
1589 const_iv (GL_TRIANGLES),
1590 const_iv (GL_TRIANGLE_STRIP),
1591 const_iv (GL_TRIANGLE_FAN),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1592 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 const_iv (GL_FASTEST), 1593 const_iv (GL_FASTEST),
1594 const_iv (GL_V2F),
1595 const_iv (GL_V3F),
1596 const_iv (GL_T2F_V3F),
1597 const_iv (GL_T2F_N3F_V3F),
1568# undef const_iv 1598# undef const_iv
1569 }; 1599 };
1570 1600
1571 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1601 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1602 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573} 1603}
1574 1604
1605char *
1606gl_vendor ()
1607 CODE:
1608 RETVAL = (char *)glGetString (GL_VENDOR);
1609 OUTPUT:
1610 RETVAL
1611
1612char *
1613gl_version ()
1614 CODE:
1615 RETVAL = (char *)glGetString (GL_VERSION);
1616 OUTPUT:
1617 RETVAL
1618
1619char *
1620gl_extensions ()
1621 CODE:
1622 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1623 OUTPUT:
1624 RETVAL
1625
1575int glGetError () 1626int glGetError ()
1576 1627
1577void glClear (int mask) 1628void glClear (int mask)
1578 1629
1579void glClearColor (float r, float g, float b, float a = 1.0) 1630void glClearColor (float r, float g, float b, float a = 1.0)
… …
1587 1638
1588void glHint (int target, int mode) 1639void glHint (int target, int mode)
1589 1640
1590void glBlendFunc (int sfactor, int dfactor) 1641void glBlendFunc (int sfactor, int dfactor)
1591 1642
1643void glDepthMask (int flag)
1644
1592void glLogicOp (int opcode) 1645void glLogicOp (int opcode)
1593 1646
1594void glColorMask (int red, int green, int blue, int alpha) 1647void glColorMask (int red, int green, int blue, int alpha)
1595 1648
1596void glMatrixMode (int mode) 1649void glMatrixMode (int mode)
… …
1599 1652
1600void glPopMatrix () 1653void glPopMatrix ()
1601 1654
1602void glLoadIdentity () 1655void glLoadIdentity ()
1603 1656
1604# near and far are due to microsofts buggy c compiler 1657# near_ and far_ are due to microsofts buggy "c" compiler
1658void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1659
1660# near_ and far_ are due to microsofts buggy "c" compiler
1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1661void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606 1662
1607void glViewport (int x, int y, int width, int height) 1663void glViewport (int x, int y, int width, int height)
1608 1664
1609void glScissor (int x, int y, int width, int height) 1665void glScissor (int x, int y, int width, int height)
… …
1625void glEnd () 1681void glEnd ()
1626 1682
1627void glColor (float r, float g, float b, float a = 1.0) 1683void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1684 PROTOTYPE: @
1629 CODE: 1685 CODE:
1686 // microsoft visual "c" rounds instead of truncating...
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1687 glColor4ub (MIN ((int)(r * 255.f), 255),
1631 MIN ((int)(g * 255.f), 255), 1688 MIN ((int)(g * 255.f), 255),
1632 MIN ((int)(b * 255.f), 255), 1689 MIN ((int)(b * 255.f), 255),
1633 MIN ((int)(a * 255.f), 255)); 1690 MIN ((int)(a * 255.f), 255));
1634 1691
1692void glInterleavedArrays (int format, int stride, char *data)
1693
1694void glDrawElements (int mode, int count, int type, char *indices)
1695
1696# 1.2 void glDrawRangeElements (int mode, int start, int end
1697
1698void glRasterPos (float x, float y, float z = 0.)
1699 CODE:
1700 glRasterPos3f (0, 0, z);
1701 glBitmap (0, 0, 0, 0, x, y, 0);
1702
1635void glVertex (float x, float y, float z = 0.) 1703void glVertex (float x, float y, float z = 0.)
1636 CODE: 1704 CODE:
1637 glVertex3f (x, y, z); 1705 glVertex3f (x, y, z);
1638 1706
1639void glTexCoord (float s, float t) 1707void glTexCoord (float s, float t)
… …
1666 1734
1667void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1735void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1668 1736
1669void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1737void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670 1738
1671void glRasterPos (int x, int y) 1739void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 1740
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1741void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676 1742
1677int glGenTexture () 1743int glGenTexture ()
1678 CODE: 1744 CODE:
… …
1705 1771
1706void glEndList () 1772void glEndList ()
1707 1773
1708void glCallList (int list) 1774void glCallList (int list)
1709 1775
1776

Diff Legend

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