[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs.
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2
3	use strict;	2	use strict;
4		3
5	use Crossfire::Client;	4	use Glib;
6	use Crossfire::Protocol;	5	use Gtk2 -init;
7
8	package Crossfire::Client; # uh, yeah
9
10	use strict;
11		6
12	use SDL;	7	use SDL;
13	use SDL::App;	8	use SDL::App;
14	use SDL::Event;	9	use SDL::Event;
15	use SDL::Surface;	10	use SDL::Surface;
16	use SDL::OpenGL;	11	use SDL::OpenGL;
17	use SDL::OpenGL::Constants;	12	use SDL::OpenGL::Constants;
18		13
19	my $conn;	14	use Crossfire;
20	my $app;	15	use Crossfire::Client;
		16	use Crossfire::Protocol;
21		17
22	my $WIDTH = 640;	18	use Crossfire::Client::Util;
23	my $HEIGHT = 480;	19	use Crossfire::Client::Widget;
24		20
25	sub glinit {	21	our $FACECACHE;
26	# nuke all gl context data	22
27		23	our $VERSION = '0.1';
		24
		25	our $CFG;
		26	our $CONN;
		27
		28	our $SDL_TIMER;
		29	our $SDL_APP;
		30	our $SDL_EV = new SDL::Event;
		31	our %SDL_CB;
		32
		33	our @GL_INIT; # hooks called on every gl init
		34
		35	sub init_screen {
28	$app = new SDL::App	36	$SDL_APP = new SDL::App
29	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	37	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
30	-title => "Crossfire+ Client",	38	-title => "Crossfire+ Client",
31	-width => $WIDTH,	39	-width => $CFG->{width},
32	-height => $HEIGHT,	40	-height => $CFG->{height},
33	-opengl => 1,	41	-opengl => 1,
34	-red_size => 8,	42	-red_size => 8,
35	-green_size => 8,	43	-green_size => 8,
36	-blue_size => 8,	44	-blue_size => 8,
37	-double_buffer => 1,	45	-double_buffer => 1,
		46	-fullscreen => $CFG->{fullscreen},
38	-resizeable => 0;	47	-resizeable => 0;
39		48
		49	glClearColor 0, 0, 0, 0;
		50
40	glEnable GL_TEXTURE_2D;	51	glEnable GL_TEXTURE_2D;
41	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL;	52	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
42	glShadeModel GL_FLAT;	53	glShadeModel GL_FLAT;
43	glDisable GL_DEPTH_TEST;	54	glDisable GL_DEPTH_TEST;
		55	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		56	glEnable GL_BLEND;
		57
44	glMatrixMode GL_PROJECTION;	58	glMatrixMode GL_PROJECTION;
		59	glLoadIdentity;
		60	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100;
45		61
46	glLoadIdentity;	62	glMatrixMode GL_MODELVIEW;
47	glOrtho 0, $WIDTH / 32, $HEIGHT / 32, 0, -1 , 1;
48		63
49	# re-bind all textures	64	$_->() for @GL_INIT;
		65	}
		66
		67	sub start_game {
		68	$SDL_TIMER = add Glib::Timeout 1000/20, sub {
		69	while ($SDL_EV->poll) {
		70	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();
		71	}
		72
		73	1
		74	};
		75
		76	init_screen;
		77
		78	$CONN = new conn
		79	host => $CFG->{host},
		80	port => $CFG->{port};
		81	}
		82
		83	sub stop_game {
		84	remove Glib::Source $SDL_TIMER;
		85
		86	undef $SDL_APP;
		87	SDL::Quit;
50	}	88	}
51		89
52	sub refresh {	90	sub refresh {
53	glClearColor 0.5, 0.5, 0.7, 0;
54	glClear GL_COLOR_BUFFER_BIT;	91	glClear GL_COLOR_BUFFER_BIT;
55		92
56	my $map = $conn->{map};	93	for (values %Client::Widget::ACTIVE_WIDGETS) {
57		94	$_->draw
58	for my $x (0 .. $conn->{mapw} - 1) {
59	for my $y (0 .. $conn->{maph} - 1) {
60
61	my $cell = $map->[$x][$y]
62	or next;
63
64	for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
65	my $tex = $conn->{face}[$num]{texture} \|\| 0;
66
67	glBindTexture GL_TEXTURE_2D, $tex;
68
69	glColor 1,0.2,0.7;
70	glBegin GL_QUADS;
71	glTexCoord 0, 0; glVertex $x, $y;
72	glTexCoord 0, 1; glVertex $x, $y + 0.9;
73	glTexCoord 1, 1; glVertex $x + 0.9, $y + 0.9;
74	glTexCoord 1, 0; glVertex $x + 0.9, $y;
75	glEnd;
76	}
77	}
78	}	95	}
79		96
80	SDL::GLSwapBuffers;	97	SDL::GLSwapBuffers;
81	}	98	}
82		99
83	my $ev = new SDL::Event;	100	%SDL_CB = (
84	my %ev_cb;	101	SDL_QUIT() => sub {
85		102	warn "sdl quit\n";#d#
86	sub event(&$) {	103	main_quit Gtk2;
87	$ev_cb{$_[0]->()} = $_[1];	104	},
88	}	105	SDL_VIDEORESIZE() => sub {
89		106	},
90	sub does(&) { shift }	107	SDL_VIDEOEXPOSE() => sub {
91
92	event {SDL_QUIT} does {
93	exit;
94	};
95
96	event {SDL_VIDEORESIZE} does {
97	print "resize\n";
98	};
99
100	event {SDL_VIDEOEXPOSE} does {
101	refresh;	108	refresh;
102	};	109	},
103		110	SDL_KEYDOWN() => sub {
104	event {SDL_KEYDOWN} does {	111	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
105	print "keypress\n";	112	# alt-enter
106	};	113	$CFG->{fullscreen} = !$CFG->{fullscreen};
107		114	init_screen;
108	event {SDL_KEYUP} does {	115	} else {
109	print "keyup\n";#d#	116	Client::Widget::feed_sdl_key_down_event ($SDL_EV);
110	};	117	}
111		118	},
112	event {SDL_MOUSEMOTION} does {	119	SDL_KEYUP() => sub {
113	print "motion\n";	120	Client::Widget::feed_sdl_key_up_event ($SDL_EV);
114	};	121	},
115		122	SDL_MOUSEMOTION() => sub {
116	event {SDL_MOUSEBUTTONDOWN} does {	123	warn "sdl motion\n";#d#
117	print "button\n";	124	},
118	};	125	SDL_MOUSEBUTTONDOWN() => sub {
119		126	Client::Widget::feed_sdl_button_down_event ($SDL_EV);
120	event {SDL_MOUSEBUTTONUP} does {	127	},
121	print "buttup\n";	128	SDL_MOUSEBUTTONUP() => sub {
122	};	129	Client::Widget::feed_sdl_button_up_event ($SDL_EV);
123		130	},
124	event {SDL_ACTIVEEVENT} does {	131	SDL_ACTIVEEVENT() => sub {
125	print "active\n";	132	warn "active\n";#d#
126	};	133	},
127		134	);
128	package Crossfire::Client;
129		135
130	@conn::ISA = Crossfire::Protocol::;	136	@conn::ISA = Crossfire::Protocol::;
131		137
132	sub conn::map_update {	138	sub conn::map_update {
133	my ($self, $dirty) = @_;	139	my ($self, $dirty) = @_;
145	my ($self) = @_;	151	my ($self) = @_;
146		152
147	refresh;	153	refresh;
148	}	154	}
149		155
		156	sub conn::face_find {
		157	my ($self, $face) = @_;
		158
		159	$FACECACHE->{"$face->{chksum},$face->{name}"}
		160	}
		161
150	sub conn::face_update {	162	sub conn::face_update {
151	my ($self, $num, $face) = @_;	163	my ($self, $face) = @_;
152		164
153	warn "up face $self,$num,$face\n";#d#	165	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
154	#TODO
155	open my $fh, ">:raw", "/tmp/x~";
156	syswrite $fh, $face->{image};
157	close $fh;
158		166
159	my $surface = new SDL::Surface -name => "/tmp/x~";	167	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
160
161	unlink "/tmp/x~";
162
163	my ($tex) = @{glGenTextures 1};
164	glGetError();
165
166	$face->{texture} = $tex;
167
168	glBindTexture GL_TEXTURE_2D, $tex;
169	my $glerr=glGetError(); die "a: ".gluErrorString($glerr)."\n" if $glerr;
170
171	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
172	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
173	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
174	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
175
176	$surface->rgba;
177
178	glTexImage2D GL_TEXTURE_2D, 0,
179	4, # components
180	$surface->width, $surface->height,
181	0,
182	GL_RGBA,
183	GL_UNSIGNED_BYTE,
184	$surface->pixels;
185	my $glerr=glGetError(); die "Problem setting up 2d Texture (dimensions not a power of 2?)):".gluErrorString($glerr)."\n" if $glerr;
186	}	168	}
187		169
188	#############################################################################	170	#############################################################################
189		171
190	use Event;	172	SDL::Init(SDL_INIT_EVERYTHING());
191		173
192	glinit;	174	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
193		175
194	$conn = new conn	176	#find_rcfile "uifont.ttf";
195	host => "cf.schmorp.de",
196	port => 13327;
197		177
198	Event->timer (after => 0, interval => 1/20, hard => 1, cb => sub {	178	$mapwidget->activate;
199	while ($ev->poll) {	179	$mapwidget->focus_in;
200	($ev_cb{$ev->type} \|\| sub { warn "unhandled event ", $ev->type })->();
201	}
202	});
203		180
204	Event::loop;	181	read_cfg "$Crossfire::VARDIR/pclientrc";
205		182
		183	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
206		184
		185	$CFG \|\|= {
		186	width => 640,
		187	height => 480,
		188	fullscreen => 0,
		189	host => "crossfire.schmorp.de",
		190	port => 13327,
		191	};
		192
		193	Crossfire::Client::Util::run_config_dialog
		194	login => sub { start_game },
		195	logout => sub { stop_game };
		196
		197	main Gtk2;
		198
		199	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs. Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.6 by root, Thu Apr 6 21:15:11 2006 UTC vs.
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC