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.74 by root, Tue Apr 11 20:44:49 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 02:00:07 2006 UTC

… …
19use CFClient; 19use CFClient;
20use CFClient::UI; 20use CFClient::UI;
21 21
22our $VERSION = '0.1'; 22our $VERSION = '0.1';
23 23
24my $MAX_FPS = 30; 24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame 25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
26 26
27our $FACECACHE; 27our $FACECACHE;
28 28
29our $CFG; 29our $CFG;
30our $CONN; 30our $CONN;
31our $FAST; # fast, low-quality mode
31 32
33our @SDL_MODES;
32our $WIDTH; 34our $WIDTH;
33our $HEIGHT; 35our $HEIGHT;
34our $FULLSCREEN; 36our $FULLSCREEN;
35 37
36our $NOW; 38our $NOW;
… …
69 -resizeable => 0; 71 -resizeable => 0;
70 72
71 $SDL_EV = new SDL::Event; 73 $SDL_EV = new SDL::Event;
72 $SDL_EV->set_unicode (1); 74 $SDL_EV->set_unicode (1);
73 75
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 76 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
75 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 77 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
76 while $SDL_EV->poll; 78 while $SDL_EV->poll;
77 79
78 1 80 1
79 }; 81 };
80 82
81 $last_refresh = SDL::GetTicks; 83 $last_refresh = SDL::GetTicks;
82 84
83 CFClient::gl_init; 85 CFClient::gl_init;
84 86
85 $FONTSIZE = int $HEIGHT / 50; 87 $FONTSIZE = int $HEIGHT / 40;
86 88
87 ############################################################################# 89 #############################################################################
88 90
89 glClearColor 0.45, 0.45, 0.45, 1;
90
91 glEnable GL_TEXTURE_2D;
92 glEnable GL_COLOR_MATERIAL;
93 glShadeModel GL_FLAT;
94 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96
97 #############################################################################
98
99 $DEBUG_STATUS = new CFClient::UI::Label; 91 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 92 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
101 93
102 $STATUS_LINE = new CFClient::UI::Label 94 $STATUS_LINE = new CFClient::UI::Label
95 padding => 0,
103 y => $HEIGHT * 59 / 60 - $FONTSIZE; 96 y => $HEIGHT * 49 / 50 - $FONTSIZE;
104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 97 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
105 98
106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 99 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
100 padding => 0,
107 y => $HEIGHT * 59 / 60, 101 y => $HEIGHT * 49 / 50,
108 height => $HEIGHT / 60, 102 height => $HEIGHT / 50,
109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 103 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 104 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111 105
112 $MAPWIDGET = new CFClient::UI::MapWidget; 106 $MAPWIDGET = new CFClient::UI::MapWidget;
113 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); 107 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
… …
123 117
124sub config_dialog { 118sub config_dialog {
125 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 119 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
126 child => (my $vbox = new CFClient::UI::VBox); 120 child => (my $vbox = new CFClient::UI::VBox);
127 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup"); 121 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
128 $vbox->add (my $table = new CFClient::UI::Table); 122 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
129 123
130 $table->add (0, 0, new CFClient::UI::Label text => "Video Mode"); 124 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
125 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
126
127 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
128 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
129
130 $mode_slider->connect (changed => sub {
131 my ($self, $value) = @_;
132
133 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
134 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
135 });
136 $mode_slider->emit (changed => $mode_slider->{range}[0]);
137
131 $table->add (0, 1, new CFClient::UI::Label text => "Host"); 138 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
139 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
140
132 $table->add (0, 2, new CFClient::UI::Label text => "Port"); 141 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
142 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
143
133 $table->add (0, 3, new CFClient::UI::Label text => "Username"); 144 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
145 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
146
134 $table->add (0, 4, new CFClient::UI::Label text => "Password", hidden => 1); 147 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
148 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
149
135 $table->add (0, 5, new CFClient::UI::Label text => "Server Map Size"); 150 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
151 $table->add (1, 5, new CFClient::UI::Slider
152 req_w => 100,
153 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
154 connect_changed => sub {
155 my ($self, $value) = @_;
156
157 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
158 },
159 );
160
161 $vbox->add (my $hbox = new CFClient::UI::HBox);
162 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
163 warn "save\n";
164 });
165 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
166 warn "login\n";
167 });
168 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
169 warn "apply\n";
170 });
136 171
137 $CFClient::UI::TOPLEVEL->add ($dialog); 172 $CFClient::UI::TOPLEVEL->add ($dialog);
138} 173}
139 174
140sub start_game { 175sub start_game {
… …
184 SDL::GLSwapBuffers; 219 SDL::GLSwapBuffers;
185} 220}
186 221
187sub debug { 222sub debug {
188 $DEBUG_STATUS->set_text ($_[0]); 223 $DEBUG_STATUS->set_text ($_[0]);
189 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request); 224 my ($w, $h) = $DEBUG_STATUS->size_request;
190 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0); 225 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
191} 226}
192 227
193my $FPS; 228my $FPS;
194 229
195sub refresh { 230sub refresh {
… …
205 my $interval = ($NOW - $last_refresh) * 0.001; 240 my $interval = ($NOW - $last_refresh) * 0.001;
206 $last_refresh = $NOW; 241 $last_refresh = $NOW;
207 242
208 if ($interval) { 243 if ($interval) {
209 $FPS ||= 1 / $interval; 244 $FPS ||= 1 / $interval;
210 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 245 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
211 debug sprintf "%5.02f", $FPS; 246 debug sprintf "%5.02f", $FPS;
212 } 247 }
213 248
214 force_refresh; 249 force_refresh;
215 $_->animate ($interval) for grep $_, values %ANIMATE; 250 $_->animate ($interval) for grep $_, values %ANIMATE;
… …
350 [qw/Password password/], 385 [qw/Password password/],
351 ); 386 );
352 387
353 my $cfg = {}; 388 my $cfg = {};
354 389
355 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
356 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
357
358 $w->add (my $vb = Gtk2::VBox->new); 390 $w->add (my $vb = Gtk2::VBox->new);
359 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 391 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
360 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 392 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
361 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 393 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
362 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 394 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
363 my $i = 0; 395 my $i = 0;
364 my $act = 0; 396 my $act = 0;
365 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 397 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
366 if ($_ eq $selmode) { $act = $i } 398 if ($_ eq $selmode) { $act = $i }
367 $cb->append_text ($_); 399 $cb->append_text ($_);
368 $i++; 400 $i++;
369 } 401 }
370 $cb->set_active ($act); 402 $cb->set_active ($act);
… …
416 448
417############################################################################# 449#############################################################################
418 450
419SDL::Init SDL_INIT_EVERYTHING; 451SDL::Init SDL_INIT_EVERYTHING;
420 452
453@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
454 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
455
421CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 456CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
422 457
423$CFG ||= { 458$CFG ||= {
424 width => 640, 459 width => 640,
425 height => 480, 460 height => 480,

Diff Legend

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