ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.86 by root, Wed Apr 12 15:35:54 2006 UTC vs.
Revision 1.92 by root, Wed Apr 12 23:32:27 2006 UTC

… …
1227our @ISA = CFClient::UI::DrawBG::; 1227our @ISA = CFClient::UI::DrawBG::;
1228 1228
1229use SDL; 1229use SDL;
1230use SDL::OpenGL; 1230use SDL::OpenGL;
1231 1231
1232my @tex =
1233 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1234 qw(b1_button_active.png);
1235
1236sub new { 1232sub new {
1237 my $class = shift; 1233 my $class = shift;
1238 1234
1239 $class->SUPER::new ( 1235 $class->SUPER::new (
1240 padding => 4, 1236 padding => 2,
1241 fg => [1, 1, 1], 1237 fg => [1, 1, 1],
1242 active_fg => [1, 1, 0], 1238 active_fg => [1, 1, 0],
1243 state => 0, 1239 state => 0,
1244 @_ 1240 @_
1245 ) 1241 )
1246} 1242}
1247 1243
1244sub size_request {
1245 my ($self) = @_;
1246
1247 ($self->{padding} * 2 + 6) x 2
1248}
1249
1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
1252
1253 $self->_size_allocate ($x, $y, $w, $h);
1254}
1255
1248sub button_down { 1256sub button_down {
1249 my ($self, $ev, $x, $y) = @_; 1257 my ($self, $ev, $x, $y) = @_;
1250 1258
1251 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1252 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1253 $self->{state} = !$self->{state}; 1261 $self->{state} = !$self->{state};
1254 $self->emit ("changed"); 1262 $self->emit (changed => $self->{state});
1255 } 1263 }
1256} 1264}
1257 1265
1258sub _draw { 1266sub _draw {
1259 my ($self) = @_; 1267 my ($self) = @_;
1260 1268
1261 local $self->{fg} = $self->{fg};
1262 my $tex = $tex[0];
1263
1264 glEnable GL_BLEND;
1265 glEnable GL_TEXTURE_2D;
1266 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1267
1268 if ($GRAB == $self) {
1269 $self->{fg} = $self->{active_fg};
1270 }
1271
1272 glBindTexture GL_TEXTURE_2D, $tex->{name};
1273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1274
1275 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1276
1277 glDisable GL_TEXTURE_2D;
1278 glDisable GL_BLEND;
1279
1280 $self->SUPER::_draw; 1269 $self->SUPER::_draw;
1270
1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1272
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1274
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276
1277 glBegin GL_LINE_LOOP;
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283
1284 if ($self->{state}) {
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1281} 1292}
1282 1293
1283############################################################################# 1294#############################################################################
1284 1295
1285package CFClient::UI::Slider; 1296package CFClient::UI::Slider;
… …
1472 1483
1473 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
1474 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1475 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1;
1477 1489
1478 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
1479 my $darkness = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
1480 1492
1481 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
… …
1512# $lighting =~ s/(.)../$1/gs; 1524# $lighting =~ s/(.)../$1/gs;
1513# } 1525# }
1514 1526
1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1516 1528
1529 if ($::CFG->{fow_smooth}) { # smooth fog of war
1530 my @conv = (
1531 0.1, 0.1, 0.1,
1532 0.1, 0.2, 0.1,
1533 0.1, 0.1, 0.1,
1534 );
1535 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1536 glConvolutionFilter2D GL_CONVOLUTION_2D,
1537 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1538 pack "f*", @conv;
1539 glEnable GL_CONVOLUTION_2D;
1540 }
1541
1517 $darkness = new CFClient::Texture 1542 $darkness = new CFClient::Texture
1518 w => $sw4, 1543 w => $sw4,
1519 h => $sh, 1544 h => $sh,
1520 data => $darkness, 1545 data => $darkness,
1521 internalformat => GL_ALPHA, 1546 internalformat => GL_ALPHA,
1522 format => GL_ALPHA; 1547 format => GL_ALPHA;
1523 1548
1524 glColor 0.45, 0.45, 0.45, 1; 1549 glColor +($::CFG->{fow_intensity}) x 3, 1;
1525 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1550 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1551
1552 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1526 1553
1527 glDisable GL_TEXTURE_2D; 1554 glDisable GL_TEXTURE_2D;
1528 glDisable GL_BLEND; 1555 glDisable GL_BLEND;
1529 1556
1530 glEndList; 1557 glEndList;
1531 } 1558 }
1532 1559
1533 glCallList $self->{list}; 1560 glCallList $self->{list};
1561
1562 if ($FOCUS != $self) {
1563 glEnable GL_BLEND;
1564 glColor 0, 0, 1, 0.4;
1565 glBegin GL_QUADS;
1566 glVertex 0, 0;
1567 glVertex 0, $::HEIGHT;
1568 glVertex $::WIDTH, $::HEIGHT;
1569 glVertex $::WIDTH, 0;
1570 glEnd;
1571 glDisable GL_BLEND;
1572 }
1534} 1573}
1535 1574
1536my %DIR = ( 1575my %DIR = (
1537 SDLK_KP8, [1, "north"], 1576 SDLK_KP8, [1, "north"],
1538 SDLK_KP9, [2, "northeast"], 1577 SDLK_KP9, [2, "northeast"],
… …
1554 1593
1555 my $mod = $ev->key_mod; 1594 my $mod = $ev->key_mod;
1556 my $sym = $ev->key_sym; 1595 my $sym = $ev->key_sym;
1557 1596
1558 if ($sym == SDLK_KP5) { 1597 if ($sym == SDLK_KP5) {
1559 $::CONN->send ("command stay fire"); 1598 $::CONN->user_send ("command stay fire");
1560 } elsif ($sym == SDLK_a) { 1599 } elsif ($sym == SDLK_a) {
1561 $::CONN->send ("command apply"); 1600 $::CONN->user_send ("command apply");
1562 } elsif (exists $DIR{$sym}) { 1601 } elsif (exists $DIR{$sym}) {
1563 if ($mod & KMOD_SHIFT) { 1602 if ($mod & KMOD_SHIFT) {
1564 $self->{shft}++; 1603 $self->{shft}++;
1565 $::CONN->send ("command fire $DIR{$sym}[0]"); 1604 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1566 } elsif ($mod & KMOD_CTRL) { 1605 } elsif ($mod & KMOD_CTRL) {
1567 $self->{ctrl}++; 1606 $self->{ctrl}++;
1568 $::CONN->send ("command run $DIR{$sym}[0]"); 1607 $::CONN->user_send ("command run $DIR{$sym}[0]");
1569 } else { 1608 } else {
1570 $::CONN->send ("command $DIR{$sym}[1]"); 1609 $::CONN->user_send ("command $DIR{$sym}[1]");
1571 } 1610 }
1572 } 1611 }
1573} 1612}
1574 1613
1575sub key_up { 1614sub key_up {
… …
1577 1616
1578 my $mod = $ev->key_mod; 1617 my $mod = $ev->key_mod;
1579 my $sym = $ev->key_sym; 1618 my $sym = $ev->key_sym;
1580 1619
1581 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1620 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1582 $::CONN->send ("command fire_stop"); 1621 $::CONN->user_send ("command fire_stop");
1583 } 1622 }
1584 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1623 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1585 $::CONN->send ("command run_stop"); 1624 $::CONN->user_send ("command run_stop");
1586 } 1625 }
1587} 1626}
1588 1627
1589############################################################################# 1628#############################################################################
1590 1629

Diff Legend

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