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.102 by root, Sat Jun 3 23:47:46 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:
1075 oy = 1 1088 oy = 1
1089 x = 2
1090 y = 3
1091 w = 4
1092 h = 5
1076 CODE: 1093 CODE:
1077 switch (ix) 1094 switch (ix)
1078 { 1095 {
1079 case 0: RETVAL = self->ox; break; 1096 case 0: RETVAL = self->ox; break;
1080 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;
1081 } 1102 }
1082 OUTPUT: 1103 OUTPUT:
1083 RETVAL 1104 RETVAL
1084 1105
1085void 1106void
… …
1512 const_iv (GL_COLOR_MATERIAL), 1533 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1534 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1535 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1536 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1537 const_iv (GL_BLEND),
1538 const_iv (GL_CULL_FACE),
1517 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),
1518 const_iv (GL_AND), 1544 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1545 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1546 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1547 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1548 const_iv (GL_SRC_ALPHA_SATURATE),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1549 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1550 const_iv (GL_ONE_MINUS_DST_ALPHA),
1525 const_iv (GL_RGB), 1551 const_iv (GL_RGB),
1526 const_iv (GL_RGBA), 1552 const_iv (GL_RGBA),
1527 const_iv (GL_UNSIGNED_BYTE), 1553 const_iv (GL_UNSIGNED_BYTE),
1554 const_iv (GL_UNSIGNED_SHORT),
1555 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1556 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1557 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1558 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1559 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1560 const_iv (GL_FLOAT),
… …
1538 const_iv (GL_TEXTURE_MAG_FILTER), 1566 const_iv (GL_TEXTURE_MAG_FILTER),
1539 const_iv (GL_TEXTURE_MIN_FILTER), 1567 const_iv (GL_TEXTURE_MIN_FILTER),
1540 const_iv (GL_TEXTURE_ENV_MODE), 1568 const_iv (GL_TEXTURE_ENV_MODE),
1541 const_iv (GL_TEXTURE_WRAP_S), 1569 const_iv (GL_TEXTURE_WRAP_S),
1542 const_iv (GL_TEXTURE_WRAP_T), 1570 const_iv (GL_TEXTURE_WRAP_T),
1571 const_iv (GL_REPEAT),
1543 const_iv (GL_CLAMP), 1572 const_iv (GL_CLAMP),
1544 const_iv (GL_REPEAT), 1573 const_iv (GL_CLAMP_TO_EDGE),
1545 const_iv (GL_NEAREST), 1574 const_iv (GL_NEAREST),
1546 const_iv (GL_LINEAR), 1575 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1576 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1577 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1578 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1579 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1580 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1581 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1582 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1583 const_iv (GL_REPLACE),
1584 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1585 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1586 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1587 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1588 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1589 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1590 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1591 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1592 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1593 const_iv (GL_LINES),
1594 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1595 const_iv (GL_QUADS),
1565 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),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1600 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 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),
1568# undef const_iv 1606# undef const_iv
1569 }; 1607 };
1570 1608
1571 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; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573} 1611}
1574 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
1575int glGetError () 1634int glGetError ()
1576 1635
1577void glClear (int mask) 1636void glClear (int mask)
1578 1637
1579void glClearColor (float r, float g, float b, float a = 1.0) 1638void glClearColor (float r, float g, float b, float a = 1.0)
… …
1587 1646
1588void glHint (int target, int mode) 1647void glHint (int target, int mode)
1589 1648
1590void glBlendFunc (int sfactor, int dfactor) 1649void glBlendFunc (int sfactor, int dfactor)
1591 1650
1651void glDepthMask (int flag)
1652
1592void glLogicOp (int opcode) 1653void glLogicOp (int opcode)
1593 1654
1594void glColorMask (int red, int green, int blue, int alpha) 1655void glColorMask (int red, int green, int blue, int alpha)
1595 1656
1596void glMatrixMode (int mode) 1657void glMatrixMode (int mode)
… …
1599 1660
1600void glPopMatrix () 1661void glPopMatrix ()
1601 1662
1602void glLoadIdentity () 1663void glLoadIdentity ()
1603 1664
1604# 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
1605void 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_)
1606 1670
1607void glViewport (int x, int y, int width, int height) 1671void glViewport (int x, int y, int width, int height)
1608 1672
1609void glScissor (int x, int y, int width, int height) 1673void glScissor (int x, int y, int width, int height)
… …
1625void glEnd () 1689void glEnd ()
1626 1690
1627void glColor (float r, float g, float b, float a = 1.0) 1691void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1692 PROTOTYPE: @
1629 CODE: 1693 CODE:
1694 // microsoft visual "c" rounds instead of truncating...
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1695 glColor4ub (MIN ((int)(r * 256.f), 255),
1631 MIN ((int)(g * 255.f), 255), 1696 MIN ((int)(g * 256.f), 255),
1632 MIN ((int)(b * 255.f), 255), 1697 MIN ((int)(b * 256.f), 255),
1633 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);
1634 1710
1635void glVertex (float x, float y, float z = 0.) 1711void glVertex (float x, float y, float z = 0.)
1636 CODE: 1712 CODE:
1637 glVertex3f (x, y, z); 1713 glVertex3f (x, y, z);
1638 1714
… …
1666 1742
1667void 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)
1668 1744
1669void 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)
1670 1746
1671void glRasterPos (int x, int y) 1747void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 1748
1675void 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)
1676 1750
1677int glGenTexture () 1751int glGenTexture ()
1678 CODE: 1752 CODE:
… …
1705 1779
1706void glEndList () 1780void glEndList ()
1707 1781
1708void glCallList (int list) 1782void glCallList (int list)
1709 1783
1784

Diff Legend

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