ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.58 by root, Mon Apr 10 11:41:17 2006 UTC vs.
Revision 1.74 by root, Tue Apr 11 20:44:49 2006 UTC

… …
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Protocol; 17use Crossfire::Protocol;
18 18
19use Crossfire::Client; 19use CFClient;
20use Crossfire::Client::Widget; 20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 30;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21 26
22our $FACECACHE; 27our $FACECACHE;
23
24our $VERSION = '0.1';
25
26our %GL_EXT;
27 28
28our $CFG; 29our $CFG;
29our $CONN; 30our $CONN;
30 31
31our $WIDTH; 32our $WIDTH;
32our $HEIGHT; 33our $HEIGHT;
33our $FULLSCREEN; 34our $FULLSCREEN;
34 35
36our $NOW;
37
38our $MAPWIDGET;
35our $FONTSIZE; 39our $FONTSIZE;
36 40
37our $SDL_TIMER; 41our $SDL_TIMER;
38our $SDL_APP; 42our $SDL_APP;
39our $SDL_EV; 43our $SDL_EV;
40our %SDL_CB; 44our %SDL_CB;
41 45
42our @GL_INIT; # hooks called on every gl init
43
44our $ALT_ENTER_MESSAGE; 46our $ALT_ENTER_MESSAGE;
45our $STATUS_LINE; 47our $STATUS_LINE;
48our $DEBUG_STATUS;
46 49
47my $last_refresh; 50my $last_refresh;
48my %ANIMATE; 51my %ANIMATE;
49my $refresh_handler; 52my $refresh_handler;
50 53
… …
66 -resizeable => 0; 69 -resizeable => 0;
67 70
68 $SDL_EV = new SDL::Event; 71 $SDL_EV = new SDL::Event;
69 $SDL_EV->set_unicode (1); 72 $SDL_EV->set_unicode (1);
70 73
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
75 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
76 while $SDL_EV->poll;
77
78 1
79 };
80
71 $last_refresh = SDL::GetTicks; 81 $last_refresh = SDL::GetTicks;
72 82
73 %GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions; 83 CFClient::gl_init;
74
75 $GL_EXT{GL_ARB_texture_non_power_of_two}
76 or warn "WARNING: non-power-of-two opengl extension required";
77 84
78 $FONTSIZE = int $HEIGHT / 50; 85 $FONTSIZE = int $HEIGHT / 50;
79 86
80 ############################################################################# 87 #############################################################################
81 88
82 glClearColor 0, 0, 0, 0; 89 glClearColor 0.45, 0.45, 0.45, 1;
83 90
84 glEnable GL_TEXTURE_2D; 91 glEnable GL_TEXTURE_2D;
85 glEnable GL_COLOR_MATERIAL; 92 glEnable GL_COLOR_MATERIAL;
86 glShadeModel GL_FLAT; 93 glShadeModel GL_FLAT;
87 glDisable GL_DEPTH_TEST; 94 glDisable GL_DEPTH_TEST;
88 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
89 96
90 $_->() for @GL_INIT;
91
92 ############################################################################# 97 #############################################################################
98
99 $DEBUG_STATUS = new CFClient::UI::Label;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
93 101
94 $STATUS_LINE = new Crossfire::Client::Widget::Label 102 $STATUS_LINE = new CFClient::UI::Label
95 0, $HEIGHT * 59 / 60 - $FONTSIZE, 1, $FONTSIZE, 103 y => $HEIGHT * 59 / 60 - $FONTSIZE;
96 "";
97 $Crossfire::Client::Widget::TOPLEVEL->add ($STATUS_LINE); 104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
98 105
99 $ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
100 0, $HEIGHT * 59 / 60, 1, $HEIGHT / 60, 107 y => $HEIGHT * 59 / 60,
108 height => $HEIGHT / 60,
101 "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
102 $Crossfire::Client::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 110 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
103 111
104 # Test code #d# 112 $MAPWIDGET = new CFClient::UI::MapWidget;
105 unless ($tw) { # haha... 113 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
106 $te = new Crossfire::Client::Widget::FancyFrame; 114 $MAPWIDGET->focus_in;
107 $te->add (new Crossfire::Client::Widget::Entry); 115}
108 $te->move (300, 0, 2);
109 $Crossfire::Client::Widget::TOPLEVEL->add ($te);
110
111 $tw = new Crossfire::Client::Widget::Animator;
112 my $lbl1 = new Crossfire::Client::Widget::Label
113 0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
114 my $lbl2 = new Crossfire::Client::Widget::Label
115 0, 0, 10, $FONTSIZE, "LBL2";
116 116
117 my $vb = new Crossfire::Client::Widget::VBox; 117sub destroy_screen {
118 my $f = new Crossfire::Client::Widget::FancyFrame; 118 remove Glib::Source $SDL_TIMER;
119 my $f2 = new Crossfire::Client::Widget::FancyFrame; 119 undef $SDL_APP;
120 $f->add ($lbl1); 120 undef $SDL_EV;
121 $f2->add ($lbl2); 121 SDL::Quit;
122 $vb->add ($f); 122}
123 $vb->add ($f2, 1);
124 123
125 $tw->add ($vb); 124sub config_dialog {
126 $tw->w (400); 125 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
127 $tw->h (300); 126 child => (my $vbox = new CFClient::UI::VBox);
128 $tw->move ($WIDTH - 200, 0); 127 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
129 $tw->moveto (0, 0); 128 $vbox->add (my $table = new CFClient::UI::Table);
130 $Crossfire::Client::Widget::TOPLEVEL->add ($tw);
131 129
132# $f->move ($WIDTH - 200, 0); 130 $table->add (0, 0, new CFClient::UI::Label text => "Video Mode");
133# $Crossfire::Client::Widget::TOPLEVEL->add ($f); 131 $table->add (0, 1, new CFClient::UI::Label text => "Host");
134 } 132 $table->add (0, 2, new CFClient::UI::Label text => "Port");
133 $table->add (0, 3, new CFClient::UI::Label text => "Username");
134 $table->add (0, 4, new CFClient::UI::Label text => "Password", hidden => 1);
135 $table->add (0, 5, new CFClient::UI::Label text => "Server Map Size");
136
137 $CFClient::UI::TOPLEVEL->add ($dialog);
135} 138}
136 139
137sub start_game { 140sub start_game {
138 $SDL_TIMER = add Glib::Timeout 1000/50, sub {
139 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
140 while $SDL_EV->poll;
141
142 1
143 };
144
145 $WIDTH = $CFG->{width}; 141 $WIDTH = $CFG->{width};
146 $HEIGHT = $CFG->{height}; 142 $HEIGHT = $CFG->{height};
147 $FULLSCREEN = 0; 143 $FULLSCREEN = 0;
148 144
149 init_screen; 145 init_screen;
150 146
147 config_dialog;
148
151 my $mapsize = List::Util::min 64, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32; 149 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
152 150
153 $CONN = new conn 151 $CONN = new conn
154 host => $CFG->{host}, 152 host => $CFG->{host},
155 port => $CFG->{port}, 153 port => $CFG->{port},
156 user => $CFG->{user}, 154 user => $CFG->{user},
157 pass => $CFG->{password}, 155 pass => $CFG->{password},
158 mapw => $mapsize, 156 mapw => $mapsize,
159 maph => $mapsize, 157 maph => $mapsize,
160 ; 158 ;
161 159
162 Crossfire::Client::lowdelay fileno $CONN->{fh}; 160 CFClient::lowdelay fileno $CONN->{fh};
163} 161}
164 162
165sub stop_game { 163sub stop_game {
166 remove Glib::Source $SDL_TIMER;
167 remove Glib::Source $refresh_handler if $refresh_handler; 164 remove Glib::Source $refresh_handler if $refresh_handler;
168 undef $refresh_handler; 165 undef $refresh_handler;
169 166
170 undef $SDL_APP;
171 undef $CONN; 167 undef $CONN;
172 SDL::Quit; 168 destroy_screen;
173} 169}
174 170
175sub force_refresh { 171sub force_refresh {
176 glViewport 0, 0, $WIDTH, $HEIGHT; 172 glViewport 0, 0, $WIDTH, $HEIGHT;
177 173
178 glMatrixMode GL_PROJECTION; 174 glMatrixMode GL_PROJECTION;
179 glLoadIdentity; 175 glLoadIdentity;
180 glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000; 176 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
181 glMatrixMode GL_MODELVIEW; 177 glMatrixMode GL_MODELVIEW;
178 glLoadIdentity;
182 179
183 glClear GL_COLOR_BUFFER_BIT; 180 glClear GL_COLOR_BUFFER_BIT;
184 181
185 $Crossfire::Client::Widget::TOPLEVEL->draw; 182 $CFClient::UI::TOPLEVEL->draw;
186 183
187 SDL::GLSwapBuffers; 184 SDL::GLSwapBuffers;
188} 185}
186
187sub debug {
188 $DEBUG_STATUS->set_text ($_[0]);
189 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
190 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
191}
192
193my $FPS;
189 194
190sub refresh { 195sub refresh {
191 $refresh_handler ||= add Glib::Idle sub { 196 $refresh_handler ||= add Glib::Idle sub {
192 if ($SDL_APP) { 197 if ($SDL_APP) {
193 my $next_refresh = SDL::GetTicks; 198 $NOW = SDL::GetTicks;
199
200 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
201 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
202 $NOW = SDL::GetTicks;
203 }
204
194 my $interval = ($next_refresh - $last_refresh) * 0.001; 205 my $interval = ($NOW - $last_refresh) * 0.001;
195 $last_refresh = $next_refresh; 206 $last_refresh = $NOW;
207
208 if ($interval) {
209 $FPS ||= 1 / $interval;
210 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
211 debug sprintf "%5.02f", $FPS;
212 }
196 213
197 force_refresh; 214 force_refresh;
198 $_->animate ($interval) for grep $_, values %ANIMATE; 215 $_->animate ($interval) for grep $_, values %ANIMATE;
199 216
200 if (%ANIMATE) { 217 if (%ANIMATE) {
… …
236 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 253 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
237 # alt-enter 254 # alt-enter
238 $FULLSCREEN = !$FULLSCREEN; 255 $FULLSCREEN = !$FULLSCREEN;
239 init_screen; 256 init_screen;
240 } else { 257 } else {
241 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 258 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
242 } 259 }
243 }, 260 },
244 SDL_KEYUP() => sub { 261 SDL_KEYUP() => sub {
245 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 262 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
246 }, 263 },
247 SDL_MOUSEMOTION() => sub { 264 SDL_MOUSEMOTION() => sub {
248 Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV); 265 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
249 }, 266 },
250 SDL_MOUSEBUTTONDOWN() => sub { 267 SDL_MOUSEBUTTONDOWN() => sub {
251 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 268 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
252 }, 269 },
253 SDL_MOUSEBUTTONUP() => sub { 270 SDL_MOUSEBUTTONUP() => sub {
254 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 271 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
255 }, 272 },
256 SDL_ACTIVEEVENT() => sub { 273 SDL_ACTIVEEVENT() => sub {
257 printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 274# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
258 }, 275 },
259); 276);
260 277
261@conn::ISA = Crossfire::Protocol::; 278@conn::ISA = Crossfire::Protocol::;
262 279
263sub conn::map_update { 280sub conn::map_update {
264 my ($self, $dirty) = @_; 281 my ($self, $dirty) = @_;
265 282
266 refresh; 283 $MAPWIDGET->update;
267} 284}
268 285
269sub conn::map_scroll { 286sub conn::map_scroll {
270 my ($self, $dx, $dy) = @_; 287 my ($self, $dx, $dy) = @_;
271 288
… …
287sub conn::face_update { 304sub conn::face_update {
288 my ($self, $face) = @_; 305 my ($self, $face) = @_;
289 306
290 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 307 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
291 308
292 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 309 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
293} 310}
294 311
295sub conn::query { 312sub conn::query {
296 my ($self, $flags, $prompt) = @_; 313 my ($self, $flags, $prompt) = @_;
297 314
… …
370 $cb->signal_connect (clicked => sub { 387 $cb->signal_connect (clicked => sub {
371 for (keys %$cfg) { 388 for (keys %$cfg) {
372 $::CFG->{$_} = $cfg->{$_} 389 $::CFG->{$_} = $cfg->{$_}
373 if $_ ne '_i'; 390 if $_ ne '_i';
374 } 391 }
375 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 392 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
376 }); 393 });
377 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 394 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
378 $cb->signal_connect (clicked => sub { 395 $cb->signal_connect (clicked => sub {
379 for (keys %$cfg) { 396 for (keys %$cfg) {
380 $::CFG->{$_} = $cfg->{$_} 397 $::CFG->{$_} = $cfg->{$_}
… …
399 416
400############################################################################# 417#############################################################################
401 418
402SDL::Init SDL_INIT_EVERYTHING; 419SDL::Init SDL_INIT_EVERYTHING;
403 420
404my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
405
406$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
407$mapwidget->focus_in;
408
409Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 421CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
410 422
411$CFG ||= { 423$CFG ||= {
412 width => 640, 424 width => 640,
413 height => 480, 425 height => 480,
414 mapsize => 100, 426 mapsize => 100,
415 fullscreen => 0, 427 fullscreen => 0,
416 host => "crossfire.schmorp.de", 428 host => "crossfire.schmorp.de",
417 port => 13327, 429 port => 13327,
418}; 430};
419 431
420Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf"; 432{
433 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
434
435 CFClient::add_font $_ for @fonts;
436 CFClient::set_font $fonts[0];
437}
421 438
422$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 439$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
423 440
424run_config_dialog 441run_config_dialog
425 login => sub { start_game }, 442 login => sub { start_game },

Diff Legend

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