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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC vs.
Revision 1.34 by root, Tue May 23 21:14:41 2006 UTC

… …
115 0.05, 0.13, 0.05, 115 0.05, 0.13, 0.05,
116 ); 116 );
117 glEnable GL_CONVOLUTION_2D; 117 glEnable GL_CONVOLUTION_2D;
118 } 118 }
119 119
120 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122
120 $self->{fow_texture} = new CFClient::Texture 123 $self->{fow_texture} = new CFClient::Texture
121 w => $w, 124 w => $w,
122 h => $h, 125 h => $h,
123 data => $data, 126 data => $data,
127 name => $prev_name, # a bit hackish
124 internalformat => GL_ALPHA, 128 internalformat => GL_ALPHA,
125 format => GL_ALPHA; 129 format => GL_ALPHA;
126 130
127 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
128 132
129 glEnable GL_BLEND;
130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
131 glEnable GL_TEXTURE_2D; 133 glEnable GL_TEXTURE_2D;
132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
133 135
134 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 136 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
135 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
136 138
137 glDisable GL_TEXTURE_2D; 139 glDisable GL_TEXTURE_2D;
138 glDisable GL_BLEND;
139 } 140 }
140 141
141 glPopMatrix; 142 glPopMatrix;
142 } 143 }
143 144
… …
147 glPushMatrix; 148 glPushMatrix;
148 glCallList $self->{list}; 149 glCallList $self->{list};
149 glPopMatrix; 150 glPopMatrix;
150 151
151 # TNT2 emulates logops in software (or worse :) 152 # TNT2 emulates logops in software (or worse :)
152 if ($CFClient::UI::FOCUS != $self) { 153 if ($CFClient::UI::FOCUS == $self) {
154 (delete $self->{out_of_focus})->destroy
155 if $self->{out_of_focus};
156 } else {
153 glColor 0.4, 0.2, 0.2, 0.9; 157 glColor 0.4, 0.2, 0.2, 0.6;
154 glEnable GL_BLEND; 158 glEnable GL_BLEND;
155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 159 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
156 glBegin GL_QUADS; 160 glBegin GL_QUADS;
157 glVertex 0, 0; 161 glVertex 0, 0;
158 glVertex 0, $::HEIGHT; 162 glVertex 0, $::HEIGHT;
159 glVertex $::WIDTH, $::HEIGHT; 163 glVertex $::WIDTH, $::HEIGHT;
160 glVertex $::WIDTH, 0; 164 glVertex $::WIDTH, 0;
161 glEnd; 165 glEnd;
162 glDisable GL_BLEND; 166 glDisable GL_BLEND;
167
168 $self->{out_of_focus} ||= do {
169 my $label = new CFClient::UI::Label
170 x => 0,
171 y => 0,
172 z => 1,
173 ellipsise => 0,
174 text => "map out of focus (click map to play)";
175
176 $label->show;
177 $label->update;
178
179 $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
180 $label->move (
181 ($::WIDTH - $label->{w}) * 0.5,
182 ($::HEIGHT - $label->{h}) * 0.5,
183 );
184 });
185
186 $label
187 };
163 } 188 }
164} 189}
165 190
166my %DIR = ( 191my %DIR = (
167 CFClient::SDLK_KP8, [1, "north"], 192 CFClient::SDLK_KP8, [1, "north"],
… …
455 480
456 @match = map $self->{command}{$_->[0]}, 481 @match = map $self->{command}{$_->[0]},
457 sort { 482 sort {
458 $a->[1] <=> $b->[1] 483 $a->[1] <=> $b->[1]
459 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 484 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
485 or (length $a->[0]) <=> (length $b->[0])
460 } @match; 486 } @match;
461 487
462 $self->{last_search} = $cmd; 488 $self->{last_search} = $cmd;
463 $self->{last_match} = \@match; 489 $self->{last_match} = \@match;
464 490

Diff Legend

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