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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.21 by root, Sat Apr 8 18:15:59 2006 UTC

…		…
1	package Crossfire::Client::Widget;	1	package Crossfire::Client::Widget;
2		2
3	use strict;	3	use strict;
		4
		5	use Scalar::Util;
		6
4	use SDL::OpenGL;	7	use SDL::OpenGL;
5	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
6		9
7	our $FOCUS; # the widget with current focus	10	our $FOCUS; # the widget with current focus
8	our @ACTIVE_WIDGETS;	11	our @ACTIVE_WIDGETS;
19	bless { @_ }, $class	22	bless { @_ }, $class
20	}	23	}
21		24
22	sub activate {	25	sub activate {
23	push @ACTIVE_WIDGETS, $_[0];	26	push @ACTIVE_WIDGETS, $_[0];
		27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
24	}	28	}
25		29
26	sub deactivate {	30	sub deactivate {
27	@ACTIVE_WIDGETS =	31	@ACTIVE_WIDGETS =
28	sort { $a->{z} <=> $b->{z} }	32	sort { $a->{z} <=> $b->{z} }
29	grep { $_ != $_[0] }	33	grep { $_ && $_ != $_[0] }
30	@ACTIVE_WIDGETS;	34	@ACTIVE_WIDGETS;
		35	}
		36
		37	sub move {
		38	my ($self, $x, $y, $z) = @_;
		39	$self->{x} = $x;
		40	$self->{y} = $y;
		41	$self->{z} = $z if defined $z;
		42	}
		43
		44	sub needs_redraw {
		45	0
31	}	46	}
32		47
33	sub size_request {	48	sub size_request {
34	die "size_request is abtract";	49	die "size_request is abtract";
35	}	50	}
…		…
80		95
81	sub bbox {	96	sub bbox {
82	my ($widget) = @_;	97	my ($widget) = @_;
83	}	98	}
84		99
		100	sub DESTROY {
		101	my ($self) = @_;
		102
		103	$self->deactivate;
		104	}
		105
85	package Crossfire::Client::Widget::Container;	106	package Crossfire::Client::Widget::Container;
86		107
87	our @ISA = Crossfire::Client::Widget::;	108	our @ISA = Crossfire::Client::Widget::;
88		109
89	use SDL::OpenGL;	110	use SDL::OpenGL;
…		…
92	sub get { $_[0]->{child} }	113	sub get { $_[0]->{child} }
93		114
94	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
95		116
96	sub _draw { die "Containers can't be drawn!" }	117	sub _draw { die "Containers can't be drawn!" }
		118
		119	package Crossfire::Client::Widget::Window;
		120
		121	our @ISA = Crossfire::Client::Widget::Container::;
		122
		123	use SDL::OpenGL;
		124
		125	sub add {
		126	my ($self, $chld) = @_;
		127	$self->SUPER::add ($chld);
		128	$self->render_chld;
		129	}
		130
		131	sub render_chld {
		132	my ($self) = @_;
		133	my $chld = $self->get;
		134	my ($w, $h) = $self->size_request;
		135
		136	$self->{texture} =
		137	Crossfire::Client::Texture->new_from_opengl (
		138	$w, $h, sub {
		139	my ($txt, $w, $h) = @_;
		140	$chld->_draw;
		141	}
		142	);
		143	$self->{texture}->upload;
		144	}
		145
		146	sub size_request {
		147	my ($self) = @_;
		148	my $chld = $self->get
		149	or return (0, 0);
		150	$chld->size_request
		151	}
		152
		153	sub _draw {
		154	my ($self) = @_;
		155
		156	my $tex = $self->{texture}
		157	or return;
		158
		159	warn "DRAW TEX: $tex->{width} $tex->{height}\n";
		160	glEnable GL_BLEND;
		161	glEnable GL_TEXTURE_2D;
		162	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		163	glBindTexture GL_TEXTURE_2D, $tex->{name};
		164
		165	glColor 1, 1, 1;
		166
		167	glBegin GL_QUADS;
		168	glTexCoord 0, 0; glVertex 0 , 0;
		169	glTexCoord 0, 1; glVertex 0 , $tex->{height};
		170	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
		171	glTexCoord 1, 0; glVertex $tex->{width}, 0;
		172	glEnd;
		173
		174	glDisable GL_BLEND;
		175	glDisable GL_TEXTURE_2D;
		176	}
97		177
98	package Crossfire::Client::Widget::Frame;	178	package Crossfire::Client::Widget::Frame;
99		179
100	our @ISA = Crossfire::Client::Widget::Container::;	180	our @ISA = Crossfire::Client::Widget::Container::;
101		181
…		…
144	my ($self, $row) = @_;	224	my ($self, $row) = @_;
145		225
146	my $hs = 0;	226	my $hs = 0;
147	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	227	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {
148	my $c = $self->{childs}->[$row]->[$xi];	228	my $c = $self->{childs}->[$row]->[$xi];
		229	if ($c) {
149	my ($w, $h) = $c->size_request if $c;	230	my ($w, $h) = $c->size_request;
150	if ($hs < $h) { $hs = $h }	231	if ($hs < $h) { $hs = $h }
		232	}
151	}	233	}
152	return $hs;	234	return $hs;
153	}	235	}
154		236
155	sub max_col_width {	237	sub max_col_width {
156	my ($self, $col) = @_;	238	my ($self, $col) = @_;
157		239
158	my $ws = 0;	240	my $ws = 0;
159	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	241	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {
160	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	242	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];
		243	if ($c) {
161	my ($w, $h) = $c->size_request if $c;	244	my ($w, $h) = $c->size_request;
162	if ($ws < $w) { $ws = $w }	245	if ($ws < $w) { $ws = $w }
		246	}
163	}	247	}
164	return $ws;	248	return $ws;
165	}	249	}
166		250
167	sub size_request {	251	sub size_request {
…		…
282	sub _draw {	366	sub _draw {
283	my ($self) = @_;	367	my ($self) = @_;
284		368
285	my $tex = $self->{texture};	369	my $tex = $self->{texture};
286		370
287	$self->{x}--;
288
289	glEnable GL_BLEND;	371	glEnable GL_BLEND;
290	glEnable GL_TEXTURE_2D;	372	glEnable GL_TEXTURE_2D;
291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
292	glBindTexture GL_TEXTURE_2D, $tex->{name};	374	glBindTexture GL_TEXTURE_2D, $tex->{name};
293		375
…		…
327		409
328	use strict;	410	use strict;
329		411
330	our @ISA = qw/Crossfire::Client::Widget/;	412	our @ISA = qw/Crossfire::Client::Widget/;
331		413
		414	use SDL;
332	use SDL::OpenGL;	415	use SDL::OpenGL;
333	use SDL::OpenGL::Constants;	416	use SDL::OpenGL::Constants;
334		417
335	sub key_down {	418	sub key_down {
336	print "MAPKEYDOWN\n";	419	print "MAPKEYDOWN\n";
…		…
338		421
339	sub key_up {	422	sub key_up {
340	}	423	}
341		424
342	sub _draw {	425	sub _draw {
		426	my ($self) = @_;
		427
343	glEnable GL_TEXTURE_2D;	428	glEnable GL_TEXTURE_2D;
344	glEnable GL_BLEND;	429	glEnable GL_BLEND;
345	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
346		431
347	my $map = $::CONN->{map};	432	my $map = $::CONN->{map};
348		433
349	for my $x (0 .. $::CONN->{mapw} - 1) {	434	for my $x (0 .. int $::WIDTH / 32) {
350	for my $y (0 .. $::CONN->{maph} - 1) {	435	for my $y (0 .. int $::HEIGHT / 32) {
351		436
352	my $cell = $map->[$x][$y]	437	my $cell = $map->[$x + $::CONN->{mapx}]
		438	[$y + $::CONN->{mapy}]
353	or next;	439	or next;
354		440
355	my $darkness = $cell->[3] * (1 / 255);	441	my $darkness = $cell->[0] * (1 / 255);
		442	if ($darkness < 0) {
		443	$darkness = 0.5;
		444	}
356	glColor $darkness, $darkness, $darkness;	445	glColor $darkness, $darkness, $darkness;
357		446
358	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {	447	for my $num (grep $_, @$cell[1,2,3]) {
359	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	448	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
360		449
361	glBindTexture GL_TEXTURE_2D, $tex->{name};	450	glBindTexture GL_TEXTURE_2D, $tex->{name};
362		451
		452	my $w = $tex->{width};
		453	my $h = $tex->{height};
		454
		455	my $px = ($x + 1) * 32 - $w;
		456	my $py = ($y + 1) * 32 - $h;
		457
363	glBegin GL_QUADS;	458	glBegin GL_QUADS;
364	glTexCoord 0, 0; glVertex $x * 32 , $y * 32;	459	glTexCoord 0, 0; glVertex $px , $py;
365	glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32;	460	glTexCoord 0, 1; glVertex $px , $py + $h;
366	glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;	461	glTexCoord 1, 1; glVertex $px + $w, $py + $h;
367	glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;	462	glTexCoord 1, 0; glVertex $px + $w, $py;
368	glEnd;	463	glEnd;
369	}	464	}
370	}	465	}
371	}	466	}
372		467
373	glDisable GL_TEXTURE_2D;	468	glDisable GL_TEXTURE_2D;
374	glDisable GL_BLEND;	469	glDisable GL_BLEND;
375	}	470	}
376		471
		472	my %DIR = (
		473	SDLK_KP8, [1, "north"],
		474	SDLK_KP9, [2, "northeast"],
		475	SDLK_KP6, [3, "east"],
		476	SDLK_KP3, [4, "southeast"],
		477	SDLK_KP2, [5, "south"],
		478	SDLK_KP1, [6, "southwest"],
		479	SDLK_KP4, [7, "west"],
		480	SDLK_KP7, [8, "northwest"],
		481
		482	SDLK_UP, [1, "north"],
		483	SDLK_RIGHT, [3, "east"],
		484	SDLK_DOWN, [5, "south"],
		485	SDLK_LEFT, [7, "west"],
		486	);
		487
		488	sub key_down {
		489	my ($self, $ev) = @_;
		490
		491	my $mod = $ev->key_mod;
		492	my $sym = $ev->key_sym;
		493
		494	if ($sym == SDLK_KP5) {
		495	$::CONN->send ("command stay fire");
		496	} elsif (exists $DIR{$sym}) {
		497	if ($mod & KMOD_SHIFT) {
		498	$self->{shft}++;
		499	$::CONN->send ("command fire $DIR{$sym}[0]");
		500	} elsif ($mod & KMOD_CTRL) {
		501	$self->{ctrl}++;
		502	$::CONN->send ("command run $DIR{$sym}[0]");
		503	} else {
		504	$::CONN->send ("command $DIR{$sym}[1]");
		505	}
		506	}
		507	}
		508
		509	sub key_up {
		510	my ($self, $ev) = @_;
		511
		512	my $mod = $ev->key_mod;
		513	my $sym = $ev->key_sym;
		514
		515	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
		516	$::CONN->send ("command fire_stop");
		517	}
		518	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
		519	$::CONN->send ("command run_stop");
		520	}
		521	}
		522
377	1;	523	1;
378		524

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs. Revision 1.21 by root, Sat Apr 8 18:15:59 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.15 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.21 by root, Sat Apr 8 18:15:59 2006 UTC