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.72 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.77 by root, Tue Apr 11 22:49:13 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;
31 31
32our @SDL_MODES;
32our $WIDTH; 33our $WIDTH;
33our $HEIGHT; 34our $HEIGHT;
34our $FULLSCREEN; 35our $FULLSCREEN;
35 36
36our $NOW; 37our $NOW;
… …
69 -resizeable => 0; 70 -resizeable => 0;
70 71
71 $SDL_EV = new SDL::Event; 72 $SDL_EV = new SDL::Event;
72 $SDL_EV->set_unicode (1); 73 $SDL_EV->set_unicode (1);
73 74
74 $SDL_TIMER = add Glib::Timeout 1000/50, sub { 75 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
75 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->() 76 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
76 while $SDL_EV->poll; 77 while $SDL_EV->poll;
77 78
78 1 79 1
79 }; 80 };
80 81
81 $last_refresh = SDL::GetTicks; 82 $last_refresh = SDL::GetTicks;
82 83
83 CFClient::gl_init; 84 CFClient::gl_init;
84 85
85 $FONTSIZE = int $HEIGHT / 50; 86 $FONTSIZE = int $HEIGHT / 40;
86 87
87 ############################################################################# 88 #############################################################################
88 89
89 glClearColor 0.45, 0.45, 0.45, 1; 90 glClearColor 0.45, 0.45, 0.45, 1;
90 91
… …
94 glDisable GL_DEPTH_TEST; 95 glDisable GL_DEPTH_TEST;
95 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 96 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96 97
97 ############################################################################# 98 #############################################################################
98 99
99 $DEBUG_STATUS = new CFClient::UI::Label; 100 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
100 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 101 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
101 102
102 $STATUS_LINE = new CFClient::UI::Label 103 $STATUS_LINE = new CFClient::UI::Label
104 padding => 0,
103 y => $HEIGHT * 59 / 60 - $FONTSIZE; 105 y => $HEIGHT * 49 / 50 - $FONTSIZE;
104 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 106 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
105 107
106 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 108 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
109 padding => 0,
107 y => $HEIGHT * 59 / 60, 110 y => $HEIGHT * 49 / 50,
108 height => $HEIGHT / 60, 111 height => $HEIGHT / 50,
109 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 112 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 113 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111 114
112 $MAPWIDGET = new CFClient::UI::MapWidget; 115 $MAPWIDGET = new CFClient::UI::MapWidget;
113 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); 116 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
114 $MAPWIDGET->focus_in; 117 $MAPWIDGET->focus_in;
115
116 # Test code #d#
117 unless ($tw) { # haha...
118 my $w = new CFClient::UI::Window
119 w => 300, h => 300,
120 child => (my $frame = new CFClient::UI::FancyFrame);
121 $CFClient::UI::TOPLEVEL->add ($w);
122
123 $frame->add (my $vbox = new CFClient::UI::VBox);
124
125 $vbox->add (new CFClient::UI::Entry text => "hallo");
126 $vbox->add (new CFClient::UI::Slider);
127
128 $tw = new CFClient::UI::Animator x => $WIDTH - 200, w => 600, h => 300;
129 my $lbl1 = new CFClient::UI::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
130 my $lbl2 = new CFClient::UI::Label text => "LBL2";
131 my $vb = new CFClient::UI::VBox;
132 my $f = new CFClient::UI::FancyFrame;
133 my $f2 = new CFClient::UI::FancyFrame;
134 $f->add ($lbl1);
135 $f2->add ($lbl2);
136 $vb->add ($f);
137 $vb->add ($f2, 1);
138
139 $tw->add ($vb);
140 $tw->moveto (0, 0);
141 $CFClient::UI::TOPLEVEL->add ($tw);
142
143# $f->move ($WIDTH - 200, 0);
144# $CFClient::UI::TOPLEVEL->add ($f);
145 }
146} 118}
147 119
148sub destroy_screen { 120sub destroy_screen {
149 remove Glib::Source $SDL_TIMER; 121 remove Glib::Source $SDL_TIMER;
150 undef $SDL_APP; 122 undef $SDL_APP;
… …
154 126
155sub config_dialog { 127sub config_dialog {
156 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 128 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
157 child => (my $vbox = new CFClient::UI::VBox); 129 child => (my $vbox = new CFClient::UI::VBox);
158 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup"); 130 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
131 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
132
133 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
134 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
135
136 $hbox->add (my $mode_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
137 $hbox->add (my $mode_label = new CFClient::UI::Label);
138
139 $mode_slider->connect (changed => sub {
140 my (undef, $value) = @_;
141
142 $CFG->{sdl_mode} = $value = int $value + 0.5;
143 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
144 });
145 $mode_slider->emit (changed => $mode_slider->{range}[0]);
146
147 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
148 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
149
150 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
151 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
152
153 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
154 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
155
156 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
157 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
158
159 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
160 $table->add (1, 5, my $mapsize_slider = new CFClient::UI::Slider req_w => 100, range => [$CFG->{mapsize}, 10, 100 + 1, 1]);
159 161
160 $CFClient::UI::TOPLEVEL->add ($dialog); 162 $CFClient::UI::TOPLEVEL->add ($dialog);
161} 163}
162 164
163sub start_game { 165sub start_game {
… …
196 198
197 glMatrixMode GL_PROJECTION; 199 glMatrixMode GL_PROJECTION;
198 glLoadIdentity; 200 glLoadIdentity;
199 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000; 201 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
200 glMatrixMode GL_MODELVIEW; 202 glMatrixMode GL_MODELVIEW;
203 glLoadIdentity;
201 204
202 glClear GL_COLOR_BUFFER_BIT; 205 glClear GL_COLOR_BUFFER_BIT;
203 206
204 $CFClient::UI::TOPLEVEL->draw; 207 $CFClient::UI::TOPLEVEL->draw;
205 208
206 SDL::GLSwapBuffers; 209 SDL::GLSwapBuffers;
207} 210}
208 211
209sub debug { 212sub debug {
210 $DEBUG_STATUS->set_text ($_[0]); 213 $DEBUG_STATUS->set_text ($_[0]);
211 $DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request); 214 my ($w, $h) = $DEBUG_STATUS->size_request;
212 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0); 215 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
213} 216}
214 217
215my $FPS; 218my $FPS;
216 219
217sub refresh { 220sub refresh {
… …
227 my $interval = ($NOW - $last_refresh) * 0.001; 230 my $interval = ($NOW - $last_refresh) * 0.001;
228 $last_refresh = $NOW; 231 $last_refresh = $NOW;
229 232
230 if ($interval) { 233 if ($interval) {
231 $FPS ||= 1 / $interval; 234 $FPS ||= 1 / $interval;
232 $FPS = $FPS * 0.96 + (1 / $interval) * 0.04; 235 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
233 debug sprintf "%5.02f", $FPS; 236 debug sprintf "%5.02f", $FPS;
234 } 237 }
235 238
236 force_refresh; 239 force_refresh;
237 $_->animate ($interval) for grep $_, values %ANIMATE; 240 $_->animate ($interval) for grep $_, values %ANIMATE;
… …
372 [qw/Password password/], 375 [qw/Password password/],
373 ); 376 );
374 377
375 my $cfg = {}; 378 my $cfg = {};
376 379
377 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
378 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
379
380 $w->add (my $vb = Gtk2::VBox->new); 380 $w->add (my $vb = Gtk2::VBox->new);
381 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 381 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
382 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 382 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
383 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 383 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
384 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 384 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
385 my $i = 0; 385 my $i = 0;
386 my $act = 0; 386 my $act = 0;
387 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 387 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
388 if ($_ eq $selmode) { $act = $i } 388 if ($_ eq $selmode) { $act = $i }
389 $cb->append_text ($_); 389 $cb->append_text ($_);
390 $i++; 390 $i++;
391 } 391 }
392 $cb->set_active ($act); 392 $cb->set_active ($act);
… …
438 438
439############################################################################# 439#############################################################################
440 440
441SDL::Init SDL_INIT_EVERYTHING; 441SDL::Init SDL_INIT_EVERYTHING;
442 442
443@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
444 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
445
443CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 446CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
444 447
445$CFG ||= { 448$CFG ||= {
446 width => 640, 449 width => 640,
447 height => 480, 450 height => 480,

Diff Legend

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