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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

… …
944 944
945############################################################################# 945#############################################################################
946 946
947package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948 948
949use List::Util qw(min max);
950
949our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
950 952
951sub new { 953sub new {
952 my $class = shift; 954 my $class = shift;
953 955
… …
984} 986}
985 987
986sub set_offset { 988sub set_offset {
987 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
988 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
991 997
998 $self->emit (changed => $x, $y);
992 $self->update; 999 $self->update;
1000 }
993} 1001}
994 1002
995# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 1004sub coord2local {
997 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1070 },
1063 ; 1071 ;
1064 1072
1065 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1067 can_events => 1, 1076 can_events => 1,
1068 hslider => $hslider, 1077 hslider => $hslider,
1069 vslider => $vslider, 1078 vslider => $vslider,
1070 col_expand => [1, 0], 1079 col_expand => [1, 0],
1071 row_expand => [1, 0], 1080 row_expand => [1, 0],
1072 %arg, 1081 %arg,
1073 ); 1082 );
1074 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1075 $self->SUPER::add (0, 0, $self->{vp}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1099
1079 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1080 1101
1081 $self 1102 $self
1082} 1103}
… …
1087 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1088 1109
1089 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1090} 1111}
1091 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1092sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1094 1146
1095 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1096 1148
1097 $self->{vslider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1098 1150
1099 1 1151 1
1100} 1152}
1101 1153
1102sub update_slider { 1154sub invoke_button_down {
1103 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1104 1156
1105 my $child = ($self->{vp} or return)->child; 1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1106 1159
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1109 #$self->{hslider}->set_visibility ($w1 != $w2); 1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1110 1165
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1167 $self->update;
1113 #$self->{vslider}->set_visibility ($h1 != $h2); 1168 };
1114}
1115 1169
1116sub update { 1170 return 1;
1117 my ($self) = @_; 1171 }
1118 1172
1119 $self->SUPER::update; 1173 0
1120 $self->update_slider; 1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1121} 1195}
1122 1196
1123sub invoke_size_allocate { 1197sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1125 1199
… …
1281 1355
1282my @border = 1356my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1286sub new { 1364sub new {
1287 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1288 1366
1289 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1537
1460 my $border = $self->border; 1538 my $border = $self->border;
1461 1539
1462 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467 1559
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1470 1562
1471 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1502 1594
1503sub new { 1595sub new {
1504 my $class = shift; 1596 my $class = shift;
1505 1597
1506 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1507 col_expand => [], 1600 col_expand => [],
1508 row_expand => [], 1601 row_expand => [],
1509 @_, 1602 @_,
1510 ) 1603 )
1511} 1604}
1512 1605
1513sub children { 1606sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515} 1608}
1516 1609
1610# TODO: store row/col info in child widget and use standard add/del
1517sub add { 1611sub add {
1518 my ($self) = shift; 1612 my ($self) = shift;
1519 1613
1520 while (@_) { 1614 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self); 1616 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1524 } 1618 }
1525 1619
1526 $self->{force_realloc} = 1; 1620 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1; 1621 $self->{force_size_alloc} = 1;
1528 $self->realloc; 1622 $self->realloc;
1529} 1623}
1530 1624
1531sub remove { 1625sub remove {
1532 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1533 1627
1534 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1535} 1633}
1536 1634
1537# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1538sub clear { 1636sub clear {
1539 my ($self) = @_; 1637 my ($self) = @_;
… …
1652 my ($self) = @_; 1750 my ($self) = @_;
1653 1751
1654 for (grep $_, @{$self->{children}}) { 1752 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_; 1753 $_->draw for grep $_, @$_;
1656 } 1754 }
1755}
1756
1757#############################################################################
1758
1759package CFPlus::UI::Fixed;
1760
1761use List::Util qw(min max);
1762
1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1657} 1837}
1658 1838
1659############################################################################# 1839#############################################################################
1660 1840
1661package CFPlus::UI::Box; 1841package CFPlus::UI::Box;
… …
2219 2399
2220use CFPlus::OpenGL; 2400use CFPlus::OpenGL;
2221 2401
2222my @tex = 2402my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
2225 2405
2226sub new { 2406sub new {
2227 my $class = shift; 2407 my $class = shift;
2228 2408
2229 $class->SUPER::new ( 2409 $class->SUPER::new (
2230 padding_x => 4, 2410 padding_x => 4,
2231 padding_y => 4, 2411 padding_y => 4,
2232 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
2233 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
2234 can_hover => 1, 2414 can_hover => 1,
2235 align => 0, 2415 align => 0,
2236 valign => 0, 2416 valign => 0,
2237 can_events => 1, 2417 can_events => 1,
2238 @_ 2418 @_
… …
2256 2436
2257 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
2260 2440
2441 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2443
2263 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2264 2445
2265 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
2266} 2447}
… …
3321 3502
3322sub new { 3503sub new {
3323 my $class = shift; 3504 my $class = shift;
3324 3505
3325 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
3326 aspect => 1, 3509 aspect => 1,
3327 can_events => 0, 3510 can_events => 0,
3328 @_, 3511 @_,
3329 ); 3512 );
3330 3513
3331 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
3333 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3334 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3520 parked => 1,
3337 interval => $self->{animspeed},
3338 cb => sub { 3521 cb => sub {
3339 delete $self->{wait_face}; 3522 return unless $::CONN && $widget;
3523
3340 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
3341 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
3342 }, 3529 },
3343 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
3344 } 3534 }
3345 3535
3346 $self 3536 $self
3347} 3537}
3348 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3349sub size_request { 3569sub size_request {
3350 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3585}
3352 3586
3353sub update { 3587sub update {
3354 my ($self) = @_; 3588 my ($self) = @_;
3355 3589
3356 return unless $self->{visible}; 3590 return unless $self->{visible};
3357 3591
3358 $self->SUPER::update; 3592 $self->SUPER::update;
3359} 3593}
3360 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3361sub _draw { 3603sub _draw {
3362 my ($self) = @_; 3604 my ($self) = @_;
3363 3605
3364 return unless $::CONN; 3606 return unless $::CONN;
3365 3607
3366 $self->SUPER::_draw; 3608 $self->SUPER::_draw;
3367 3609
3368 my $face;
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}] 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3378 or return; 3611 or return;
3379 3612
3380 my $tex = $::CONN->{texture}[$faceid]; 3613 my $tex = $::CONN->{texture}[$faceid];
3381 3614
3382 if ($tex) { 3615 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3619 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3620 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3621 }
3393} 3622}
3394 3623
3395sub destroy { 3624sub destroy {
3396 my ($self) = @_; 3625 my ($self) = @_;
3397 3626
3398 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3399 if $self->{timer}; 3628 if $self->{timer};
3400 3629
3401 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3402} 3631}
3403 3632
… …
4047 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
4048 $_->() 4277 $_->()
4049 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
4050 } 4279 }
4051 4280
4052
4053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
4056 4284
4057 glMatrixMode GL_PROJECTION; 4285 glMatrixMode GL_PROJECTION;

Diff Legend

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