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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.3 by root, Wed Apr 19 20:46:44 2006 UTC vs.
Revision 1.15 by root, Mon Apr 24 13:01:13 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 SDL::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	$class->SUPER::new (
15	z => -1,	16	z => -1,
16	can_focus => 1,	17	can_focus => 1,
17	list => (glGenLists 1),	18	list => glGenList,
18	@_	19	@_
19	)	20	)
20	}	21	}
21		22
22	sub key_down {	23	sub DESTROY {
23	print "MAPKEYDOWN\n";	24	my $self = shift;
24	}
25		25
26	sub key_up {	26	glDeleteList $self->{list};
		27
		28	$self->SUPER::DESTROY;
27	}	29	}
28		30
29	sub button_down {	31	sub button_down {
30	my ($self, $ev, $x, $y) = @_;	32	my ($self, $ev, $x, $y) = @_;
31		33
32	$self->focus_in;	34	$self->focus_in;
33		35
34	if ($ev->button == 2) {	36	if ($ev->{button} == 2) {
35	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	37	my ($ox, $oy) = ($ev->{x}, $ev->{y});
36	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});	38	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
37		39
38	$self->{motion} = sub {	40	$self->{motion} = sub {
39	my ($ev, $x, $y) = @_;	41	my ($ev, $x, $y) = @_;
40		42
41	($x, $y) = ($ev->motion_x, $ev->motion_y);	43	($x, $y) = ($ev->{x}, $ev->{y});
42		44
43	$::CFG->{map_shift_x} = $bw + $x - $ox;	45	$::CFG->{map_shift_x} = $bw + $x - $ox;
44	$::CFG->{map_shift_y} = $bh + $y - $oy;	46	$::CFG->{map_shift_y} = $bh + $y - $oy;
45		47
46	$self->update;	48	$self->update;
76		78
77	sub draw {	79	sub draw {
78	my ($self) = @_;	80	my ($self) = @_;
79		81
80	if (delete $self->{need_update}) {	82	if (delete $self->{need_update}) {
81	glNewList $self->{list}, GL_COMPILE;	83	glNewList $self->{list};
82		84
83	if ($::MAP) {	85	if ($::MAP) {
84	my $sw = int $::WIDTH / 32;	86	my $sw = int $::WIDTH / (32 * $::CFG->{map_scale});
85	my $sh = int $::HEIGHT / 32;	87	my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale});
86		88
		89	glScale $::CFG->{map_scale}, $::CFG->{map_scale};
		90
87	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;	91	my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
88	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;	92	my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
89		93
90	glTranslate $sx0 - 32, $sy0 - 32, 0;	94	glTranslate $sx0 - 32, $sy0 - 32, 0;
91		95
92	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);	96	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
93		97
…		…
98	GL_CONVOLUTION_2D,	102	GL_CONVOLUTION_2D,
99	GL_ALPHA,	103	GL_ALPHA,
100	3, 3,	104	3, 3,
101	GL_ALPHA, GL_FLOAT,	105	GL_ALPHA, GL_FLOAT,
102	pack "f*",	106	pack "f*",
103	0.1, 0.1, 0.1,	107	0.05, 0.13, 0.05,
104	0.1, 0.2, 0.1,	108	0.13, 0.30, 0.13,
105	0.1, 0.1, 0.1,	109	0.05, 0.13, 0.05,
106	);	110	);
107	glEnable GL_CONVOLUTION_2D;	111	glEnable GL_CONVOLUTION_2D;
108	}	112	}
109		113
110	$self->{fow_texture} = new CFClient::Texture	114	$self->{fow_texture} = new CFClient::Texture
…		…
119	glEnable GL_BLEND;	123	glEnable GL_BLEND;
120	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	124	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
121	glEnable GL_TEXTURE_2D;	125	glEnable GL_TEXTURE_2D;
122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	126	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
123		127
124	glColor +($::CFG->{fow_intensity}) x 3, 1;	128	glColor +($::CFG->{fow_intensity}) x 3, 0.8;
125	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);	129	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
126		130
127	glDisable GL_TEXTURE_2D;	131	glDisable GL_TEXTURE_2D;
128	glDisable GL_BLEND;	132	glDisable GL_BLEND;
129	}	133	}
130		134
131	# HACK BEGIN	135	# HACK BEGIN
132	{	136	{
133	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove	137	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
		138
		139	glTranslate 0, 30;
134	my ($w, $h) = (250, 250);	140	my ($w, $h) = (250, 250);
		141
		142	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
135		143
136	glEnable GL_BLEND;	144	glEnable GL_BLEND;
137	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	145	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
138	glEnable GL_TEXTURE_2D;	146	glEnable GL_TEXTURE_2D;
139	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	147	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
140		148
141	$self->{mapmap_texture} =	149	$self->{mapmap_texture} =
142	new CFClient::Texture	150	new CFClient::Texture
143	w => $w,	151	w => $w,
144	h => $h,	152	h => $h,
145	data => $::MAP->mapmap ($w, $h),	153	data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
146	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;	154	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
147		155
148	$self->{mapmap_texture}->draw_quad (100, 100);	156	$self->{mapmap_texture}->draw_quad (0, 0);
149		157
150	glDisable GL_TEXTURE_2D;	158	glDisable GL_TEXTURE_2D;
		159
		160	glTranslate 0.375, 0.375;
		161
		162	glColor 1, 1, 0, 1;
		163	glBegin GL_LINE_LOOP;
		164	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
		165	glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
		166	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
		167	glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
		168	glEnd;
		169
151	glDisable GL_BLEND;	170	glDisable GL_BLEND;
152	}	171	}
153	# HACK END	172	# HACK END
154	}	173	}
155		174
…		…
191	);	210	);
192		211
193	sub key_down {	212	sub key_down {
194	my ($self, $ev) = @_;	213	my ($self, $ev) = @_;
195		214
196	my $mod = $ev->key_mod;	215	my $mod = $ev->{mod};
197	my $sym = $ev->key_sym;	216	my $sym = $ev->{sym};
198		217
199	if ($sym == CFClient::SDLK_KP5) {	218	if ($sym == CFClient::SDLK_KP5) {
200	$::CONN->user_send ("stay fire");	219	$::CONN->user_send ("stay fire");
		220	} elsif ($sym == ord ",") {
		221	$::CONN->user_send ("take");
201	} elsif ($sym == ord "a") {	222	} elsif ($sym == ord "a") {
202	$::CONN->user_send ("apply");	223	$::CONN->user_send ("apply");
203	} elsif ($sym == ord "'") {	224	} elsif ($sym == ord "'") {
204	$self->emit ('activate_console');	225	$self->emit ('activate_console');
205	} elsif ($sym == ord "/") {	226	} elsif ($sym == ord "/") {
206	$self->emit ('activate_console' => '/');	227	$self->emit (activate_console => '/');
207	} elsif (exists $DIR{$sym}) {	228	} elsif (exists $DIR{$sym}) {
208	if ($mod & CFClient::KMOD_SHIFT) {	229	if ($mod & CFClient::KMOD_SHIFT) {
209	$self->{shft}++;	230	$self->{shft}++;
210	$::CONN->user_send ("fire $DIR{$sym}[0]");	231	$::CONN->user_send ("fire $DIR{$sym}[0]");
211	} elsif ($mod & CFClient::KMOD_CTRL) {	232	} elsif ($mod & CFClient::KMOD_CTRL) {
212	$self->{ctrl}++;	233	$self->{ctrl}++;
213	$::CONN->user_send ("run $DIR{$sym}[0]");	234	$::CONN->user_send ("run $DIR{$sym}[0]");
214	} else {	235	} else {
215	$::CONN->user_send ("$DIR{$sym}[1]");	236	$::CONN->user_send ("$DIR{$sym}[1]");
216	}	237	}
		238	} elsif ($ev->{unicode}) {
		239	$self->{command_widget} \|\|=
		240	new CFClient::MapWidget::Command::
		241	command => $self->{command},
		242	can_focus => 1,
		243	connect_execute => sub {
		244	# todo: support callback instead of user_send
		245	$::CONN->user_send ($_[1][1]);
		246	},
		247	connect_close => sub {
		248	(delete $self->{command_widget})->hide;
		249	$self->focus_in;
		250	},
		251	;
		252	$self->{command_widget}->key_down ($ev);
		253	return unless $self->{command_widget};
		254	$self->{command_widget}->show;
		255	$self->{command_widget}->focus_in;
217	}	256	}
218	}	257	}
219		258
220	sub key_up {	259	sub key_up {
221	my ($self, $ev) = @_;	260	my ($self, $ev) = @_;
222		261
223	my $mod = $ev->key_mod;	262	my $mod = $ev->{mod};
224	my $sym = $ev->key_sym;	263	my $sym = $ev->{sym};
225		264
226	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {	265	if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
227	$::CONN->user_send ("fire_stop");	266	$::CONN->user_send ("fire_stop");
228	}	267	}
229	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {	268	if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230	$::CONN->user_send ("run_stop");	269	$::CONN->user_send ("run_stop");
231	}	270	}
232	}	271	}
233		272
234	sub add_command {	273	sub add_command {
235	my ($self, $command, $widget, $cb) = @_;	274	my ($self, $command, $tooltip, $widget, $cb) = @_;
236		275
237	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;	276	(my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
238	warn "$command\|$abbrev\|$widget\n";#d#	277
		278	push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
		279	}
		280
		281	package CFClient::MapWidget::Command;
		282
		283	use strict;
		284
		285	use CFClient::OpenGL;
		286
		287	our @ISA = CFClient::UI::VBox::;
		288
		289	sub new {
		290	my $class = shift;
		291
		292	my $self = $class->SUPER::new (
		293	@_,
		294	children => [map
		295	CFClient::UI::Label->new (
		296	can_hover => 1,
		297	can_events => 1,
		298	fontsize => $_,
		299	), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
		300	],
		301	);
		302
		303	$self
		304	}
		305
		306	sub size_allocate {
		307	my ($self, $w, $h) = @_;
		308
		309	$self->SUPER::size_allocate ($w, $h);
		310	$self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
		311	}
		312
		313	sub update_labels {
		314	my ($self) = @_;
		315
		316	my $command = $self->{command};
		317	my $search_abbrev = qr/^\Q$self->{search}/;
		318	my $search_full = qr/\Q$self->{search}/;
		319
		320	my @found;
		321
		322	for (@$command) {
		323	if ($_->[0] =~ $search_abbrev) {
		324	push @found, [$_->[0], $_];
		325	} elsif ($_->[1] =~ $search_full) {
		326	push @found, [$_->[1], $_];
		327	}
		328	}
		329
		330	@found = sort { $a->[0] cmp $b->[0] } @found;
		331
		332	$self->{children}[0]->set_text ("$self->{search}_");
		333
		334	for (0..5) {
		335	$self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
		336	$self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
		337	}
		338
		339	$self->{select} = $found[0][1]
		340	if @found;
		341
		342	if (@found > 6) {
		343	$self->{children}[6]->set_text ("...");
		344	}
		345
		346	$self->check_size;
		347	}
		348
		349	sub key_down {
		350	my ($self, $ev) = @_;
		351
		352	if ($ev->{sym} == 8) {
		353	substr $self->{search}, -1, 1, "";
		354	$self->update_labels;
		355	} elsif ($ev->{sym} == 13) {
		356	if (exists $self->{select}) {
		357	$self->emit (execute => $self->{select});
		358	$self->emit ("close");
		359	}
		360	} elsif ($ev->{sym} == 27) {
		361	$self->emit ("close");
		362	return;
		363	} elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
		364	$self->{search} .= chr $ev->{unicode};
		365	$self->update_labels;
		366	}
		367
		368	length $self->{search}
		369	or $self->emit ("close");
239	}	370	}
240		371
241	1	372	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.3 by root, Wed Apr 19 20:46:44 2006 UTC vs. Revision 1.15 by root, Mon Apr 24 13:01:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.3 by root, Wed Apr 19 20:46:44 2006 UTC vs.
Revision 1.15 by root, Mon Apr 24 13:01:13 2006 UTC