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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs. Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.29 by root, Thu May 18 16:42:26 2006 UTC