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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.226 by root, Tue May 23 23:14:46 2006 UTC

… …
134 for (@$vals) { 134 for (@$vals) {
135 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
139} 147}
140 148
141# call when resolution changes etc. 149# call when resolution changes etc.
142sub rescale_widgets { 150sub rescale_widgets {
143 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
… …
198 %$self = (); 206 %$self = ();
199} 207}
200 208
201sub show { 209sub show {
202 my ($self) = @_; 210 my ($self) = @_;
203
204 return if $self->{parent}; 211 return if $self->{parent};
205 212
206 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
207} 227}
208 228
209sub hide { 229sub hide {
210 my ($self) = @_; 230 my ($self) = @_;
211 231
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
420 440
421 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 442 $self->check_size
423 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
424} 446}
425 447
426sub check_size { 448sub check_size {
427 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
428 450
… …
721 743
722sub size_request { 744sub size_request {
723 my ($self) = @_; 745 my ($self) = @_;
724 746
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 748
728 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
729} 750}
730 751
731sub size_allocate { 752sub size_allocate {
732 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
733 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 758 $self->update;
735} 759}
736 760
737sub set_offset { 761sub set_offset {
738 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
798 }, 822 },
799 ; 823 ;
800 824
801 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 827 slider => $slider,
804 @_, 828 @_,
805 ); 829 );
806 830
807 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
1466 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1467 can_hover => 1, 1491 can_hover => 1,
1468 can_focus => 1, 1492 can_focus => 1,
1469 valign => 0, 1493 valign => 0,
1470 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1471 @_ 1496 @_
1472 ) 1497 )
1473} 1498}
1474 1499
1475sub _set_text { 1500sub _set_text {
… …
2050 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2051 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2053 vertical => 0, 2078 vertical => 0,
2054 can_hover => 1, 2079 can_hover => 1,
2055 inner_pad => .05, 2080 inner_pad => 0.02,
2056 @_ 2081 @_
2057 ); 2082 );
2058 2083
2059 $self->set_value ($self->{range}[0]); 2084 $self->set_value ($self->{range}[0]);
2060 $self->update; 2085 $self->update;
2061 2086
2062 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2063} 2096}
2064 2097
2065sub set_value { 2098sub set_value {
2066 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2067 2100
… …
2168 # draw handle 2201 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2203
2171 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2172} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2173 2247
2174############################################################################# 2248#############################################################################
2175 2249
2176package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2177 2251
… …
2207 2281
2208 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2283 $self->reflow;
2210} 2284}
2211 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2212sub text_height { 2298sub text_height {
2213 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2214 2300
2215 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2216 2302
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2219 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2220 2306
2221 ($layout->size)[1] 2307 ($layout->size)[1]
2222} 2308}
2223 2309
… …
2226 2312
2227 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2228 $self->update; 2314 $self->update;
2229} 2315}
2230 2316
2231sub size_allocate { 2317sub clear {
2232 my ($self, $w, $h) = @_; 2318 my ($self) = @_;
2233 2319
2234 $self->SUPER::size_allocate ($w, $h); 2320 $self->{par} = [];
2235 2321 $self->{height} = 0;
2236 $self->{layout}->set_font ($self->{font}) if $self->{font};
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2322
2240 $self->reflow; 2323 $self->reflow;
2241} 2324}
2242 2325
2243sub add_paragraph { 2326sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2327 my ($self, $color, $text, $indent) = @_;
2245 2328
2246 #TODO: intelligently "reformat" paragraph 2329 for my $line (split /\n/, $text) {
2247
2248 my $height = $self->text_height ($text); 2330 my $height = $self->text_height ($line);
2249
2250 $self->{height} += $height; 2331 $self->{height} += $height;
2251
2252 push @{$self->{par}}, [$height, $color, $text]; 2332 push @{$self->{par}}, [$height, $color, $indent, $line];
2333 }
2253 2334
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2255 $self->{children}[1]->update; 2336 $self->{children}[1]->update;
2256} 2337}
2257 2338
… …
2266 2347
2267 $ROOT->on_post_alloc ($self, sub { 2348 $ROOT->on_post_alloc ($self, sub {
2268 if (delete $self->{need_reflow}) { 2349 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2350 my $height = 0;
2270 2351
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2272 for @{$self->{par}}; 2353 for @{$self->{par}};
2273 2354
2274 $self->{height} = $height; 2355 $self->{height} = $height;
2275 2356
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2358 $self->{children}[1]->update;
2277 2359
2278 delete $self->{texture}; 2360 delete $self->{texture};
2279 } 2361 }
2280 2362
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2364 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2365 glClear GL_COLOR_BUFFER_BIT;
2284 2366
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2367 my $top = int $self->{children}[1]{range}[0];
2289 2368
2290 my $y0 = $top; 2369 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2370 my $y1 = $top + $self->{h};
2292 2371
… …
2294 2373
2295 my $layout = $self->{layout}; 2374 my $layout = $self->{layout};
2296 2375
2297 $layout->set_font ($self->{font}) if $self->{font}; 2376 $layout->set_font ($self->{font}) if $self->{font};
2298 2377
2378 glEnable GL_BLEND;
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380
2299 for my $par (@{$self->{par}}) { 2381 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2382 my $h = $par->[0];
2301 2383
2302 if ($y0 < $y + $h && $y < $y1) { 2384 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2385 $layout->set_foreground (@{ $par->[1] });
2386 $layout->set_width ($self->{w} - $par->[2]);
2304 $layout->set_markup ($par->[2]); 2387 $layout->set_markup ($par->[3]);
2305 2388
2306 my ($W, $H) = $layout->size; 2389 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2390
2391 glRasterPos $par->[2], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2393 }
2309 2394
2310 $y += $h; 2395 $y += $h;
2311 } 2396 }
2312 2397
2313 glDisable GL_TEXTURE_2D; 2398 glDisable GL_BLEND;
2314 }; 2399 };
2315 }); 2400 });
2316} 2401}
2317 2402
2318sub _draw { 2403sub _draw {
… …
2489use CFClient::OpenGL; 2574use CFClient::OpenGL;
2490 2575
2491sub new { 2576sub new {
2492 my $class = shift; 2577 my $class = shift;
2493 2578
2494 $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2495 aspect => 1, 2580 aspect => 1,
2496 @_, 2581 @_,
2497 ) 2582 );
2583
2584 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self);
2586
2587 $self->{timer} = Event->timer (
2588 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2589 hard => 1,
2590 interval => $self->{animspeed},
2591 cb => sub {
2592 ++$widget->{frame};
2593 $widget->update;
2594 },
2595 );
2596 }
2597
2598 $self
2498} 2599}
2499 2600
2500sub size_request { 2601sub size_request {
2501 (32, 8) 2602 (32, 8)
2502} 2603}
2503 2604
2605sub update {
2606 my ($self) = @_;
2607
2608 return unless $self->{visible};
2609
2610 $self->SUPER::update;
2611}
2612
2504sub _draw { 2613sub _draw {
2505 my ($self) = @_; 2614 my ($self) = @_;
2506 2615
2507 return unless $::CONN;#d# manage and cache textures differently 2616 return unless $::CONN;#d# manage and cache textures differently
2617
2618 my $face;
2619
2620 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}];
2622
2623 $face = $anim->[ $self->{frame} % @$anim ]
2624 if $anim && @$anim;
2625 }
2626
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2627 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2628
2510 # TODO animation
2511 if ($tex) { 2629 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2632 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2633 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2517 } 2635 }
2518} 2636}
2519 2637
2638sub DESTROY {
2639 my ($self) = @_;
2640
2641 $self->{timer}->cancel
2642 if $self->{timer};
2643
2644 $self->SUPER::DESTROY;
2645}
2646
2520############################################################################# 2647#############################################################################
2521 2648
2522package CFClient::UI::InventoryItem; 2649package CFClient::UI::InventoryItem;
2523 2650
2524our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFClient::UI::HBox::;
… …
2527 my ($item) = @_; 2654 my ($item) = @_;
2528 2655
2529 my $desc = 2656 my $desc =
2530 $item->{nrof} < 2 2657 $item->{nrof} < 2
2531 ? $item->{name} 2658 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}"; 2659 : "$item->{nrof} × $item->{name_pl}";
2533 2660
2534 $item->{flags} & Crossfire::Protocol::F_OPEN 2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)"; 2662 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED 2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)"; 2664 and $desc .= " (applied)";
… …
2557 my $item = delete $args{item}; 2684 my $item = delete $args{item};
2558 2685
2559 my $desc = _item_to_desc ($item); 2686 my $desc = _item_to_desc ($item);
2560 2687
2561 my $self = $class->SUPER::new ( 2688 my $self = $class->SUPER::new (
2562 can_hover => 1, 2689 can_hover => 1,
2563 can_events => 1, 2690 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc) 2691 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub { 2693 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_; 2694 my ($self, $ev, $x, $y) = @_;
2568 2695
2569 # todo: maybe put examine on 1? but should just be a tooltip :( 2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) { 2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag}; 2698 my $targ = $::CONN->{player}{tag};
2572 2699
2573 if ($item->{container} == $::CONN->{player}{tag}) { 2700 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT; 2701 $targ = $main::OPENCONT;
2575 } 2702 }
2576 2703
2577 $::CONN->send ("move $targ $item->{tag} 0"); 2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2578 } elsif ($ev->{button} == 2) { 2707 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}"); 2708 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) { 2709 } elsif ($ev->{button} == 3) {
2581 my @menu_items = ( 2710 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [ 2722 )
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ], 2723 ),
2590 ); 2724 );
2591 2725
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 } 2727 }
2594 2728
… …
2630 2764
2631sub new { 2765sub new {
2632 my $class = shift; 2766 my $class = shift;
2633 2767
2634 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox), 2769 scrolled => (new CFClient::UI::Table),
2636 @_, 2770 @_,
2637 ); 2771 );
2638 2772
2639 $self 2773 $self
2640} 2774}
… …
2651 } @$items; 2785 } @$items;
2652 2786
2653 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2654 2788
2655 for my $item (@items) { 2789 for my $item (@items) {
2790 $item->{item} = $item;
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item (); 2792 $item->update_item ();
2658 } 2793 }
2659 2794
2795 my $i = 0;
2796 for (@items) {
2660 $self->{scrolled}->add (@items); 2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2661 2801
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663} 2803}
2664 2804
2665sub size_request { 2805sub size_request {
… …
2937 $child->{x} = int $child->{x}; 3077 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y}; 3078 $child->{y} = int $child->{y};
2939 } 3079 }
2940 3080
2941 $self->SUPER::add (@children); 3081 $self->SUPER::add (@children);
3082
3083 while (@children) {
3084 my $w = pop @children;
3085 push @children, $w->children;
3086 $w->{visible} = 1;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 }
2942} 3100}
2943 3101
2944sub on_refresh { 3102sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3103 my ($self, $id, $cb) = @_;
2946 3104
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
3017 3175
3018 glMatrixMode GL_PROJECTION; 3176 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3177 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3179 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3180 glLoadIdentity;
3023 3181
3024 $self->_draw; 3182 $self->_draw;
3025} 3183}

Diff Legend

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