[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.10 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC

…		…
1	package CFClient::MapWidget;	1	package CFClient::MapWidget;
2		2
3	use strict;	3	use strict;
		4	use utf8;
4		5
5	use List::Util qw(min max);	6	use List::Util qw(min max);
6		7
7	use CFClient::OpenGL;	8	use CFClient::OpenGL;
8		9
9	our @ISA = CFClient::UI::Base::;	10	our @ISA = CFClient::UI::Base::;
10		11
11	sub new {	12	sub new {
12	my $class = shift;	13	my $class = shift;
13		14
14	$class->SUPER::new (	15	my $self = $class->SUPER::new (
15	z => -1,	16	z => -1,
16	can_focus => 1,	17	can_focus => 1,
17	list => glGenList,	18	list => glGenList,
18	@_	19	@_
19	)	20	);
		21
		22	$self
20	}	23	}
21		24
22	sub DESTROY {	25	sub DESTROY {
23	my $self = shift;	26	my $self = shift;
24		27
76	}	79	}
77		80
78	sub draw {	81	sub draw {
79	my ($self) = @_;	82	my ($self) = @_;
80		83
		84	return
		85	unless $CFClient::UI::FOCUS == $self \|\| !$::FAST;
		86
81	if (delete $self->{need_update}) {	87	if (delete $self->{need_update}) {
82	glNewList $self->{list};	88	glNewList $self->{list};
83		89
84	if ($::MAP) {	90	if ($::MAP) {
85	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});	91	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
86	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});	92	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
87
88	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
89		93
90	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	94	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
91	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	95	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
		96
		97	glPushMatrix;
		98	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
92		99
93	glTranslate $sx0 - 32, $sy0 - 32, 0;	100	glTranslate $sx0 - 32, $sy0 - 32, 0;
94		101
95	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	102	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
96		103
…		…
108	0.05, 0.13, 0.05,	115	0.05, 0.13, 0.05,
109	);	116	);
110	glEnable GL_CONVOLUTION_2D;	117	glEnable GL_CONVOLUTION_2D;
111	}	118	}
112		119
		120	# try to re-use the texture name: TODO improve texture class instead
		121	my $prev_name = ((delete $self->{fow_texture}) \|\| {})->{name};
		122
113	$self->{fow_texture} = new CFClient::Texture	123	$self->{fow_texture} = new CFClient::Texture
114	w => $w,	124	w => $w,
115	h => $h,	125	h => $h,
116	data => $data,	126	data => $data,
		127	name => $prev_name, # a bit hackish
117	internalformat => GL_ALPHA,	128	internalformat => GL_ALPHA,
118	format => GL_ALPHA;	129	format => GL_ALPHA;
119		130
120	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};	131	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
121		132
122	glEnable GL_BLEND;
123	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
124	glEnable GL_TEXTURE_2D;	133	glEnable GL_TEXTURE_2D;
125	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
126		135
127	glColor +($::CFG->{fow_intensity}) x 3, 0.8;	136	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
128	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	137	$self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32);
129		138
130	glDisable GL_TEXTURE_2D;	139	glDisable GL_TEXTURE_2D;
131	glDisable GL_BLEND;
132	}	140	}
133		141
134	# HACK BEGIN	142	glPopMatrix;
135	{
136	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
137
138	glTranslate 0, 30;
139	my ($w, $h) = (250, 250);
140
141	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
142
143	glEnable GL_BLEND;
144	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
145	glEnable GL_TEXTURE_2D;
146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
147
148	$self->{mapmap_texture} =
149	new CFClient::Texture
150	w => $w,
151	h => $h,
152	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
153	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
154
155	$self->{mapmap_texture}->draw_quad (0, 0);
156
157	glDisable GL_TEXTURE_2D;
158
159	glTranslate 0.375, 0.375;
160
161	glColor 1, 1, 0, 1;
162	glBegin GL_LINE_LOOP;
163	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
164	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
165	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
166	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
167	glEnd;
168
169	glDisable GL_BLEND;
170	}
171	# HACK END
172	}	143	}
173		144
174	glEndList;	145	glEndList;
175	}	146	}
176		147
177	glPushMatrix;	148	glPushMatrix;
178	glCallList $self->{list};	149	glCallList $self->{list};
179	glPopMatrix;	150	glPopMatrix;
180		151
		152	# TNT2 emulates logops in software (or worse :)
181	if ($CFClient::UI::FOCUS != $self) {	153	if ($CFClient::UI::FOCUS != $self) {
182	glColor 64/255, 64/255, 64/255;	154	glColor 0.4, 0.2, 0.2, 0.9;
183	glLogicOp GL_AND;	155	glEnable GL_BLEND;
184	glEnable GL_COLOR_LOGIC_OP;	156	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
185	glBegin GL_QUADS;	157	glBegin GL_QUADS;
186	glVertex 0, 0;	158	glVertex 0, 0;
187	glVertex 0, $::HEIGHT;	159	glVertex 0, $::HEIGHT;
188	glVertex $::WIDTH, $::HEIGHT;	160	glVertex $::WIDTH, $::HEIGHT;
189	glVertex $::WIDTH, 0;	161	glVertex $::WIDTH, 0;
190	glEnd;	162	glEnd;
191	glDisable GL_COLOR_LOGIC_OP;	163	glDisable GL_BLEND;
192	}	164	}
193	}	165	}
194		166
195	my %DIR = (	167	my %DIR = (
196	CFClient::SDLK_KP8, [1, "north"],	168	CFClient::SDLK_KP8, [1, "north"],
…		…
209	);	181	);
210		182
211	sub key_down {	183	sub key_down {
212	my ($self, $ev) = @_;	184	my ($self, $ev) = @_;
213		185
		186	return unless $::CONN;
		187
214	my $mod = $ev->{mod};	188	my $mod = $ev->{mod};
215	my $sym = $ev->{sym};	189	my $sym = $ev->{sym};
		190	my $uni = $ev->{unicode};
216		191
217	if ($sym == CFClient::SDLK_KP5) {	192	if ($sym == CFClient::SDLK_KP5) {
218	$::CONN->user_send ("stay fire");	193	$::CONN->user_send ("stay fire");
219	} elsif ($sym == ord "a") {	194	} elsif ($uni == ord ",") {
		195	$::CONN->user_send ("take");
		196	} elsif ($uni == ord "\t" or $uni == ord " ") {
220	$::CONN->user_send ("apply");	197	$::CONN->user_send ("apply");
		198	} elsif ($sym == CFClient::SDLK_KP_PLUS \|\| $uni == ord "+") {
		199	$::CONN->user_send ("rotateshoottype +");
		200	} elsif ($sym == CFClient::SDLK_KP_MINUS \|\| $uni == ord "-") {
		201	$::CONN->user_send ("rotateshoottype -");
221	} elsif ($sym == ord "'") {	202	} elsif ($uni == ord "'") {
222	$self->emit ('activate_console');	203	$self->emit ('activate_console');
223	} elsif ($sym == ord "/") {	204	} elsif ($uni == ord "/") {
224	$self->emit (activate_console => '/');	205	$self->emit (activate_console => '/');
225	} elsif (exists $DIR{$sym}) {	206	} elsif (exists $DIR{$sym}) {
226	if ($mod & CFClient::KMOD_SHIFT) {	207	if ($mod & CFClient::KMOD_SHIFT) {
227	$self->{shft}++;	208	$self->{shft}++;
228	$::CONN->user_send ("fire $DIR{$sym}[0]");	209	$::CONN->user_send ("fire $DIR{$sym}[0]");
…		…
236	$self->{command_widget} \|\|=	217	$self->{command_widget} \|\|=
237	new CFClient::MapWidget::Command::	218	new CFClient::MapWidget::Command::
238	command => $self->{command},	219	command => $self->{command},
239	can_focus => 1,	220	can_focus => 1,
240	connect_execute => sub {	221	connect_execute => sub {
		222	# todo: support callback instead of user_send
241	$::CONN->user_send ($_[1]);	223	$::CONN->user_send ($_[1]);
242	},	224	},
243	connect_close => sub {	225	connect_close => sub {
244	(delete $self->{command_widget})->hide;	226	(delete $self->{command_widget})->hide;
245	$self->focus_in;	227	$self->focus_in;
246	},	228	},
247	;	229	;
248	$self->{command_widget}->key_down ($ev);	230	$self->{command_widget}->key_down ($ev)
		231	unless $ev->{unicode} == 20;
		232	return unless $self->{command_widget};
249	$self->{command_widget}->show;	233	$self->{command_widget}->show;
250	$self->{command_widget}->focus_in;	234	$self->{command_widget}->focus_in;
251	}	235	}
252	}	236	}
253		237
…		…
264	$::CONN->user_send ("run_stop");	248	$::CONN->user_send ("run_stop");
265	}	249	}
266	}	250	}
267		251
268	sub add_command {	252	sub add_command {
269	my ($self, $command, $widget, $cb) = @_;	253	my ($self, $command, $tooltip, $widget, $cb) = @_;
270		254
271	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	255	(my $data = $command) =~ s/\\//g;
272		256
273	push @{$self->{command}}, [$abbrev, $command];	257	$tooltip =~ s/^\s+//;
274	#warn "$command\|$abbrev\|$widget\n";#d#	258
		259	$tooltip = "<big>$data</big>\n\n$tooltip";
		260
		261	$tooltip =~ s/\s+$//;
		262
		263	$self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
		264	}
		265
		266	sub clr_commands {
		267	my ($self) = @_;
		268
		269	%{$self->{command}} = ();
		270	}
		271
		272	package CFClient::MapWidget::MapMap;
		273
		274	our @ISA = CFClient::UI::Base::;
		275
		276	use Time::HiRes qw(time);
		277	use CFClient::OpenGL;
		278
		279	sub size_request {
		280	($::HEIGHT * 0.25, $::HEIGHT * 0.25)
		281	}
		282
		283	sub size_allocate {
		284	my ($self, $w, $h) = @_;
		285
		286	$self->SUPER::size_allocate ($w, $h);
		287	$self->update;
		288	}
		289
		290	sub update {
		291	my ($self) = @_;
		292
		293	delete $self->{texture_atime};
		294	$self->SUPER::update;
		295	}
		296
		297	sub _draw {
		298	my ($self) = @_;
		299
		300	$::MAP or return;
		301
		302	my ($w, $h) = @$self{qw(w h)};
		303
		304	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
		305	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
		306
		307	my $sx = int $::CFG->{map_shift_x} / 32;
		308	my $sy = int $::CFG->{map_shift_y} / 32;
		309
		310	my $ox = 0.5 * ($w - $sw);
		311	my $oy = 0.5 * ($h - $sh);
		312
		313	glEnable GL_BLEND;
		314	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		315	glEnable GL_TEXTURE_2D;
		316	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		317
		318	if ($self->{texture_atime} < time) {
		319	$self->{texture_atime} = time + 1/3;
		320
		321	$self->{texture} =
		322	new CFClient::Texture
		323	w => $w,
		324	h => $h,
		325	data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
		326	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
		327	}
		328
		329	$self->{texture}->draw_quad (0, 0);
		330
		331	glDisable GL_TEXTURE_2D;
		332
		333	glTranslate 0.375, 0.375;
		334
		335	#TODO: map scale is completely borked
		336
		337	my $x0 = int $ox - $sx + 0.5;
		338	my $y0 = int $oy - $sy + 0.5;
		339
		340	glColor 1, 1, 0, 1;
		341	glBegin GL_LINE_LOOP;
		342	glVertex $x0 , $y0 ;
		343	glVertex $x0 , $y0 + $sh;
		344	glVertex $x0 + $sw, $y0 + $sh;
		345	glVertex $x0 + $sw, $y0 ;
		346	glEnd;
		347
		348	glDisable GL_BLEND;
275	}	349	}
276		350
277	package CFClient::MapWidget::Command;	351	package CFClient::MapWidget::Command;
278		352
279	use strict;	353	use strict;
280		354
281	use CFClient::OpenGL;	355	use CFClient::OpenGL;
282		356
283	our @ISA = CFClient::UI::VBox::;	357	our @ISA = CFClient::UI::Frame::;
284		358
285	sub new {	359	sub new {
286	my $class = shift;	360	my $class = shift;
287		361
288	my $self = $class->SUPER::new (	362	my $self = $class->SUPER::new (
		363	bg => [0, 0, 0, 0.8],
289	@_,	364	@_,
290	children => [map	365	);
		366
		367	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		368
		369	$self->{label} = [
		370	map
291	CFClient::UI::Label->new (	371	CFClient::UI::Label->new (
292	can_hover => 1,	372	can_hover => 1,
		373	can_events => 1,
		374	tooltip_width => 0.33,
293	fontsize => $_,	375	fontsize => $_,
294	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8	376	), (0.8) x 16
		377	];
		378
		379	$self->{entry} = new CFClient::UI::Entry
		380	connect_changed => sub {
		381	$self->update_labels;
295	],	382	};
		383
		384	$self->{vbox}->add (
		385	$self->{entry},
		386	@{$self->{label}},
296	);	387	);
297		388
298	$self	389	$self
299	}	390	}
300		391
…		…
303		394
304	$self->SUPER::size_allocate ($w, $h);	395	$self->SUPER::size_allocate ($w, $h);
305	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);	396	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
306	}	397	}
307		398
308	sub update_labels {
309	my ($self) = @_;
310
311	my $command = $self->{command};
312	my $search_abbrev = qr/^\Q$self->{search}/;
313	my $search_full = qr/\Q$self->{search}/;
314
315	my @found;
316
317	for (@$command) {
318	if ($_->[0] =~ $search_abbrev) {
319	push @found, [$_->[0], $_];
320	} elsif ($_[1] =~ $search_full) {
321	push @found, [$_->[1], $_];
322	}
323	}
324
325	@found = sort { $a->[0] cmp $b->[0] } @found;
326
327	$self->{children}[0]->set_text ("$self->{search}_");
328
329	for (0..5) {
330	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
331	}
332
333	$self->{select} = $found[0][1][1]
334	if @found;
335
336	if (@found > 6) {
337	$self->{children}[6]->set_text ("...");
338	}
339
340	$self->check_size;
341	}
342
343	sub key_down {	399	sub key_down {
344	my ($self, $ev) = @_;	400	my ($self, $ev) = @_;
345		401
346	if ($ev->{sym} == 8) {	402	if ($ev->{sym} == 13) {
347	substr $self->{search}, -1, 1, "";
348	$self->update_labels;
349	} elsif ($ev->{sym} == 13) {
350	if (exists $self->{select}) {	403	if (exists $self->{select}) {
351	$self->emit (execute => $self->{select});	404	$self->emit (execute => $self->{select});
352	$self->emit ("close");	405	$self->emit ("close");
353	}	406	}
354	} elsif ($ev->{sym} == 27) {	407	} elsif ($ev->{sym} == 27) {
		408	$self->{entry}->set_text ("");
355	$self->emit ("close");	409	$self->emit ("close");
356	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {	410	return;
357	$self->{search} .= chr $ev->{unicode};	411	} elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
		412	++$self->{select_offset}
		413	if $self->{select_offset} < $#{ $self->{last_match} \|\| [] };
358	$self->update_labels;	414	$self->update_labels;
		415	} elsif ($ev->{sym} == CFClient::SDLK_UP) {
		416	--$self->{select_offset}
		417	if $self->{select_offset};
		418	$self->update_labels;
		419	} else {
		420	#$self->{entry}{force_alloc} = 1;
		421	$self->{entry}->key_down ($ev);
359	}	422	}
		423	}
360		424
361	length $self->{search}	425	sub update_labels {
		426	my ($self) = @_;
		427
		428	my $text = $self->{entry}->get_text;
		429
		430	length $text
362	or $self->emit ("close");	431	or return $self->emit ("close");
		432
		433	my ($cmd, $arg) = $text =~ /^\s([^[:space:]])(.*)$/;
		434
		435	if ($cmd ne $self->{last_search}) {
		436	my $regexp = do {
		437	my ($beg, @chr) = split //, lc $cmd;
		438
		439	# the following regex is used to match our "completion entry"
		440	# to an actual command - the parentheses match kind of "overhead"
		441	# - the more characters the parentheses match, the less attractive
		442	# is the match.
		443	my $regexp = "^\Q$beg\E"
		444	. join "", map "(?:.?[ \\\\]\Q$_\E\|(.?)\Q$_\E)", @chr;
		445	qr<$regexp>
		446	};
		447
		448	my @match;
		449	my @penalty;
		450
		451	for (keys %{$self->{command}}) {
		452	if (@penalty = $_ =~ $regexp) {
		453	push @match, [$_, length join "", map "::$_", grep defined, @penalty];
		454	}
		455	}
		456
		457	@match = map $self->{command}{$_->[0]},
		458	sort {
		459	$a->[1] <=> $b->[1]
		460	or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
		461	} @match;
		462
		463	$self->{last_search} = $cmd;
		464	$self->{last_match} = \@match;
		465
		466	$self->{select_offset} = 0;
		467	}
		468
		469	my @labels = @{ $self->{label} };
		470	my @matches = @{ $self->{last_match} \|\| [] };
		471
		472	if ($self->{select_offset}) {
		473	splice @matches, 0, $self->{select_offset}, ();
		474
		475	my $label = shift @labels;
		476	$label->set_text ("...");
		477	$label->set_tooltip ("Use Cursor-Up to view previous matches");
		478	}
		479
		480	for my $label (@labels) {
		481	$label->{fg} = [1, 1, 1, 1];
		482	$label->{bg} = [0, 0, 0, 0];
		483	}
		484
		485	if (@matches) {
		486	$self->{select} = "$matches[0][0]$arg";
		487
		488	$labels[0]->{fg} = [0, 0, 0, 1];
		489	$labels[0]->{bg} = [1, 1, 1, 0.8];
		490	} else {
		491	$self->{select} = "$cmd$arg";
		492	}
		493
		494	for my $match (@matches) {
		495	my $label = shift @labels;
		496
		497	if (@labels) {
		498	$label->set_text ("$match->[0]$arg");
		499	$label->set_tooltip ($match->[1]);
		500	} else {
		501	$label->set_text ("...");
		502	$label->set_tooltip ("Use Cursor-Down to view more matches");
		503	last;
		504	}
		505	}
		506
		507	for my $label (@labels) {
		508	$label->set_text ("");
		509	$label->set_tooltip ("");
		510	}
		511
		512	$self->update;
		513	###
		514	}
		515
		516	sub _draw {
		517	my ($self) = @_;
		518
		519	# hack
		520	local $CFClient::UI::FOCUS = $self->{entry};
		521
		522	$self->SUPER::_draw;
363	}	523	}
364		524
365	1	525	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.10 by root, Mon Apr 24 03:19:42 2006 UTC vs. Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.10 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC