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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.30 by root, Wed Apr 12 21:35:10 2006 UTC vs.
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use SDL::OpenGL; 24use Carp ();
25use AnyEvent ();
26use BerkeleyDB;
27
28use CFClient::OpenGL;
25 29
26our %GL_EXT; 30our %GL_EXT;
27our $GL_VERSION; 31our $GL_VERSION;
28 32
29our $GL_NPOT; 33our $GL_NPOT;
34our $GL_DEBUG = 1;
30 35
31sub gl_init { 36sub gl_init {
32 $GL_VERSION = gl_version * 1; 37 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34 39
35 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 40 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
36 41
37 glEnable GL_TEXTURE_2D;
38 glEnable GL_COLOR_MATERIAL; 42 glDisable GL_COLOR_MATERIAL;
39 glShadeModel GL_FLAT; 43 glShadeModel GL_FLAT;
44 glDisable GL_DITHER;
40 glDisable GL_DEPTH_TEST; 45 glDisable GL_DEPTH_TEST;
41 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
42
43 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST; 46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
44 47
45 CFClient::Texture::restore_state (); 48 CFClient::Texture::restore_state ();
49}
50
51sub gl_check {
52 return unless $GL_DEBUG;
53
54 if (my $error = glGetError) {
55 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
56 }
46} 57}
47 58
48sub find_rcfile($) { 59sub find_rcfile($) {
49 my $path; 60 my $path;
50 61
51 for (@INC) { 62 for (grep !ref, @INC) {
52 $path = "$_/CFClient/resources/$_[0]"; 63 $path = "$_/CFClient/resources/$_[0]";
53 return $path if -r $path; 64 return $path if -r $path;
54 } 65 }
55 66
56 die "FATAL: can't find required file $_[0]\n"; 67 die "FATAL: can't find required file $_[0]\n";
… …
86 } 97 }
87 98
88 close CFG; 99 close CFG;
89} 100}
90 101
102mkdir "$Crossfire::VARDIR/pclient", 0777;
103
104our $DB_ENV = new BerkeleyDB::Env
105 -Home => "$Crossfire::VARDIR/pclient",
106 -Cachesize => 1_000_000,
107 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
108# -ErrPrefix => "DATABASE",
109 -Verbose => 1,
110 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
111 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
112
113sub db_table($) {
114 my ($table) = @_;
115
116 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
117
118 new CFClient::Database
119 -Env => $DB_ENV,
120 -Filename => $table,
121# -Filename => "database",
122# -Subname => $table,
123 -Property => DB_CHKSUM,
124 -Flags => DB_CREATE | DB_UPGRADE,
125 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
126}
127
128sub pod_to_pango($) {
129 my ($pom) = @_;
130
131 $pom->present ("CFClient::PodToPango")
132}
133
134package CFClient::PodToPango;
135
136use base Pod::POM::View::Text;
137
138our $indent = 0;
139
140*view_seq_code =
141*view_seq_bold = sub { "<b>$_[1]</b>" };
142*view_seq_italic = sub { "<i>$_[1]</i>" };
143*view_seq_space =
144*view_seq_link =
145*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
146
147sub view_seq_text {
148 my $text = $_[1];
149 $text =~ s/\s+/ /g;
150 CFClient::UI::Label::escape ($text)
151}
152
153sub view_item {
154 ("\t" x ($indent / 4))
155 . $_[1]->title->present ($_[0])
156 . "\n"
157 . $_[1]->content->present ($_[0])
158}
159
160sub view_textblock {
161 ("\t" x ($indent / 2)) . "$_[1]\n\n"
162}
163
164sub view_head2 {
165 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
166 . $_[1]->content->present ($_[0])
167};
168
169sub view_over {
170 local $indent = $indent + $_[1]->indent;
171 $_[1]->content->present ($_[0])
172}
173
174package CFClient::Database;
175
176our @ISA = BerkeleyDB::Btree::;
177
178sub get($$) {
179 my $data;
180
181 $_[0]->db_get ($_[1], $data) == 0
182 ? $data
183 : ()
184}
185
186my %DB_SYNC;
187
188sub put($$$) {
189 my ($db, $key, $data) = @_;
190
191 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
192
193 $db->db_put ($key => $data)
194}
195
91package CFClient::Texture; 196package CFClient::Texture;
92 197
93use strict; 198use strict;
94 199
95use Scalar::Util; 200use Scalar::Util;
96 201
97use SDL::OpenGL; 202use CFClient::OpenGL;
98 203
99my @textures; 204my %TEXTURES;
100 205
101sub new { 206sub new {
102 my ($class, %data) = @_; 207 my ($class, %data) = @_;
103 208
104 my $self = bless { 209 my $self = bless {
… …
106 format => GL_RGBA, 211 format => GL_RGBA,
107 type => GL_UNSIGNED_BYTE, 212 type => GL_UNSIGNED_BYTE,
108 %data, 213 %data,
109 }, $class; 214 }, $class;
110 215
111 push @textures, $self; 216 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
112 Scalar::Util::weaken $textures[-1];
113 217
114 $self->upload; 218 $self->upload;
115 219
116 $self 220 $self
117} 221}
118 222
119sub new_from_image { 223sub new_from_image {
120 my ($class, $image) = @_; 224 my ($class, $image, %arg) = @_;
121 225
122 $class->new (image => $image) 226 $class->new (image => $image, %arg)
123} 227}
124 228
125sub new_from_file { 229sub new_from_file {
126 my ($class, $path) = @_; 230 my ($class, $path, %arg) = @_;
127 231
128 open my $fh, "<:raw", $path 232 open my $fh, "<:raw", $path
129 or die "$path: $!"; 233 or die "$path: $!";
130 234
131 local $/; 235 local $/;
132 $class->new_from_image (<$fh>) 236 $class->new_from_image (<$fh>, %arg)
133} 237}
134 238
135#sub new_from_surface { 239#sub new_from_surface {
136# my ($class, $surface) = @_; 240# my ($class, $surface) = @_;
137# 241#
… …
143# h => $surface->height, 247# h => $surface->height,
144# ) 248# )
145#} 249#}
146 250
147sub new_from_layout { 251sub new_from_layout {
148 my ($class, $layout) = @_; 252 my ($class, $layout, %arg) = @_;
149 253
150 my ($w, $h, $data) = $layout->render; 254 my ($w, $h, $data, $format, $internalformat) = $layout->render;
151 255
152 $class->new ( 256 $class->new (
153 w => $w, 257 w => $w,
154 h => $h, 258 h => $h,
155 data => $data, 259 data => $data,
156 internalformat => GL_ALPHA4,
157 format => GL_ALPHA, 260 format => $format,
261 internalformat => $format,
158 type => GL_UNSIGNED_BYTE, 262 type => GL_UNSIGNED_BYTE,
263 %arg,
159 ) 264 )
160} 265}
161 266
162sub new_from_opengl { 267sub new_from_opengl {
163 my ($class, $w, $h, $cb) = @_; 268 my ($class, $w, $h, $cb) = @_;
164 269
165 $class->new (w => $w, h => $h, render_cb => $cb) 270 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
166} 271}
167 272
168sub topot { 273sub topot {
169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 274 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
170} 275}
… …
179 if (exists $self->{data}) { 284 if (exists $self->{data}) {
180 $data = $self->{data}; 285 $data = $self->{data};
181 286
182 } elsif (exists $self->{render_cb}) { 287 } elsif (exists $self->{render_cb}) {
183 glViewport 0, 0, $self->{w}, $self->{h}; 288 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
185 glMatrixMode GL_PROJECTION; 289 glMatrixMode GL_PROJECTION;
186 glLoadIdentity; 290 glLoadIdentity;
291 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_MODELVIEW; 292 glMatrixMode GL_MODELVIEW;
188 glLoadIdentity; 293 glLoadIdentity;
189 glClear GL_COLOR_BUFFER_BIT;
190 $self->{render_cb}->($self, $self->{w}, $self->{h}); 294 $self->{render_cb}->($self, $self->{w}, $self->{h});
191 295
192 } else { 296 } else {
193 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 297 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
194 = CFClient::load_image_inline $self->{image}; 298 = CFClient::load_image_inline $self->{image};
195 } 299 }
196 300
197 my ($tw, $th) = @$self{qw(w h)}; 301 my ($tw, $th) = @$self{qw(w h)};
198 302
199 unless ($tw && $th) { 303 unless ($tw > 0 && $th > 0) {
200 $tw = $th = 1; 304 $tw = $th = 1;
201 $data = "\x00" x 64; 305 $data = "\x00" x 64;
202 } 306 }
307
308 $self->{minified} = [CFClient::average $tw, $th, $data]
309 if $self->{minify};
203 310
204 unless ($GL_NPOT) { 311 unless ($GL_NPOT) {
205 # TODO: does not work for zero-sized textures 312 # TODO: does not work for zero-sized textures
206 $tw = topot $tw; 313 $tw = topot $tw;
207 $th = topot $th; 314 $th = topot $th;
208 315
209 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 316 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
210 my $bpp = (length $data) / ($self->{w} * $self->{h}); 317 my $bpp = (length $data) / ($self->{w} * $self->{h});
211 $data = pack "(a" . ($tw * $bpp) . ")*", 318 $data = pack "(a" . ($tw * $bpp) . ")*",
212 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 319 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
213 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 320 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
214 } 321 }
215 } 322 }
216 323
217 $self->{s} = $self->{w} / $tw; 324 $self->{s} = $self->{w} / $tw;
218 $self->{t} = $self->{h} / $th; 325 $self->{t} = $self->{h} / $th;
219 326
220 $self->{name} ||= (glGenTextures 1)->[0]; 327 $self->{name} ||= glGenTexture;
221 328
222 glBindTexture GL_TEXTURE_2D, $self->{name}; 329 glBindTexture GL_TEXTURE_2D, $self->{name};
223 330
224 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
225 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 331 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 332 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
333
334 if ($::FAST) {
335 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
336 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
337 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
338 # alternatively check for 0x8191
339 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
340 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
341 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
342 } else {
343 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
344 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
345 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
346 }
228 347
348 glGetError;
349
229 if (defined $data) { 350 if (defined $data) {
230 glTexImage2D GL_TEXTURE_2D, 0, 351 glTexImage2D GL_TEXTURE_2D, 0,
231 $self->{internalformat}, 352 $self->{internalformat},
232 $tw, $th, # need to pad texture first 353 $tw, $th, # need to pad texture first
233 0, 354 0,
234 $self->{format}, 355 $self->{format},
235 $self->{type}, 356 $self->{type},
236 $data; 357 $data;
237 glGetError and die; 358 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
359 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
238 } else { 360 } else {
239 glCopyTexImage2D GL_TEXTURE_2D, 0, 361 glCopyTexImage2D GL_TEXTURE_2D, 0,
240 $self->{internalformat}, 362 $self->{internalformat},
241 0, 0, 363 0, 0,
242 $tw, $th, 364 $tw, $th,
243 0; 365 0;
244 glGetError and die; 366 CFClient::gl_check "copying to texture %dx%d if=%x",
367 $tw, $th, $self->{internalformat};
245 } 368 }
246} 369}
247 370
248sub DESTROY { 371sub DESTROY {
249 my ($self) = @_; 372 my ($self) = @_;
250 373
251 return unless exists $self->{name}; 374 delete $TEXTURES{$self+0};
252 375
253 glDeleteTextures delete $self->{name}; 376 glDeleteTexture delete $self->{name}
377 if $self->{name};
254} 378}
255 379
256sub restore_state{ 380sub restore_state{
257 $_->upload 381 $_->upload
258 for grep $_, @textures; 382 for values %TEXTURES;
259}; 383};
260 384
2611; 3851;
262 386
263=back 387=back

Diff Legend

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