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.20 by root, Mon Apr 10 22:16:33 2006 UTC vs.
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire::Client - undocumented utility garbage for our crossfire client 3CFClient - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use Crossfire::Client; 7 use CFClient;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Crossfire::Client; 15package CFClient;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "Crossfire::Client", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23
24use Carp ();
25use AnyEvent;
26use BerkeleyDB;
27use CFClient::OpenGL;
23 28
24our %GL_EXT; 29our %GL_EXT;
25our $GL_VERSION; 30our $GL_VERSION;
26 31
27our $GL_NPOT; 32our $GL_NPOT;
33our $GL_DEBUG = 1;
28 34
29sub gl_init { 35sub gl_init {
30 $GL_VERSION = gl_version * 1; 36 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 37 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 38
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 39 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34 40
41 glDisable GL_COLOR_MATERIAL;
42 glShadeModel GL_FLAT;
43 glDisable GL_DITHER;
44 glDisable GL_DEPTH_TEST;
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
35 Crossfire::Client::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
48}
49
50sub gl_check {
51 return unless $GL_DEBUG;
52
53 if (my $error = glGetError) {
54 Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;
55 }
36} 56}
37 57
38sub find_rcfile($) { 58sub find_rcfile($) {
39 my $path; 59 my $path;
40 60
41 for (@INC) { 61 for (grep !ref, @INC) {
42 $path = "$_/Crossfire/resources/$_[0]"; 62 $path = "$_/CFClient/resources/$_[0]";
43 return $path if -r $path; 63 return $path if -r $path;
44 } 64 }
45 65
46 die "FATAL: can't find required file $_[0]\n"; 66 die "FATAL: can't find required file $_[0]\n";
47} 67}
… …
76 } 96 }
77 97
78 close CFG; 98 close CFG;
79} 99}
80 100
101mkdir "$Crossfire::VARDIR/pclient", 0777;
102
103our $DB_ENV = new BerkeleyDB::Env
104 -Home => "$Crossfire::VARDIR/pclient",
105 -Cachesize => 1_000_000,
106 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
107# -ErrPrefix => "DATABASE",
108 -Verbose => 1,
109 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
110 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
111
112sub db_table($) {
113 my ($table) = @_;
114
115 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
116
117 new CFClient::Database
118 -Env => $DB_ENV,
119 -Filename => $table,
120# -Filename => "database",
121# -Subname => $table,
122 -Property => DB_CHKSUM,
123 -Flags => DB_CREATE | DB_UPGRADE,
124 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
125}
126
127package CFClient::Database;
128
129our @ISA = BerkeleyDB::Btree::;
130
131sub get($$) {
132 my $data;
133
134 $_[0]->db_get ($_[1], $data) == 0
135 ? $data
136 : ()
137}
138
139my %DB_SYNC;
140
141sub put($$$) {
142 my ($db, $key, $data) = @_;
143
144 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
145
146 $db->db_put ($key => $data)
147}
148
81package Crossfire::Client::Texture; 149package CFClient::Texture;
150
151use strict;
82 152
83use Scalar::Util; 153use Scalar::Util;
84 154
85use SDL::OpenGL; 155use CFClient::OpenGL;
86 156
87my @textures; 157my %TEXTURES;
88 158
89sub new { 159sub new {
90 my ($class, %data) = @_; 160 my ($class, %data) = @_;
91 161
92 my $self = bless { 162 my $self = bless {
93 internalformat => GL_RGBA, 163 internalformat => GL_RGBA,
94 format => GL_RGBA, 164 format => GL_RGBA,
165 type => GL_UNSIGNED_BYTE,
95 %data, 166 %data,
96 }, $class; 167 }, $class;
97 168
98 push @textures, $self; 169 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
99 Scalar::Util::weaken $textures[-1];
100 170
101 $self->upload; 171 $self->upload;
102 172
103 $self 173 $self
104} 174}
105 175
106sub new_from_image { 176sub new_from_image {
107 my ($class, $image) = @_; 177 my ($class, $image, %arg) = @_;
108 178
109 $class->new (image => $image) 179 $class->new (image => $image, %arg)
110} 180}
111 181
112sub new_from_file { 182sub new_from_file {
113 my ($class, $path) = @_; 183 my ($class, $path, %arg) = @_;
114 184
115 open my $fh, "<:raw", $path 185 open my $fh, "<:raw", $path
116 or die "$path: $!"; 186 or die "$path: $!";
117 187
118 local $/; 188 local $/;
119 $class->new_from_image (<$fh>) 189 $class->new_from_image (<$fh>, %arg)
120} 190}
121 191
122#sub new_from_surface { 192#sub new_from_surface {
123# my ($class, $surface) = @_; 193# my ($class, $surface) = @_;
124# 194#
125# $surface->rgba; 195# $surface->rgba;
126# 196#
127# $class->new ( 197# $class->new (
128# data => $surface->pixels, 198# data => $surface->pixels,
129# width => $surface->width, 199# w => $surface->width,
130# height => $surface->height, 200# h => $surface->height,
131# ) 201# )
132#} 202#}
133 203
134sub new_from_text { 204sub new_from_layout {
135 my ($class, $text, $height) = @_; 205 my ($class, $layout, %arg) = @_;
136 206
137 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 207 my ($w, $h, $data, $format, $internalformat) = $layout->render;
138 208
139 $class->new ( 209 $class->new (
140 width => $w, 210 w => $w,
141 height => $h, 211 h => $h,
142 data => $data, 212 data => $data,
143 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 213 format => $format,
214 internalformat => $format,
215 type => GL_UNSIGNED_BYTE,
216 %arg,
145 ) 217 )
146} 218}
147 219
148sub new_from_opengl { 220sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 221 my ($class, $w, $h, $cb) = @_;
150 222
151 $class->new (width => $w, height => $h, rendercb => $cb) 223 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
152} 224}
153 225
154sub topot { 226sub topot {
155 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 227 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
156} 228}
157 229
158sub upload { 230sub upload {
159 my ($self) = @_; 231 my ($self) = @_;
160 232
161 return unless $SDL::App::USING_OPENGL; 233 return unless $GL_VERSION;
162 234
163 my $data; 235 my $data;
164 236
165 if (exists $self->{data}) { 237 if (exists $self->{data}) {
166 $data = $self->{data}; 238 $data = $self->{data};
239
167 } elsif (exists $self->{rendercb}) { 240 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{width}, $self->{height}; 241 glViewport 0, 0, $self->{w}, $self->{h};
169 glMatrixMode GL_PROJECTION; 242 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 243 glLoadIdentity;
171 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000; 244 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 245 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 246 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{rendercb}->($self, $self->{width}, $self->{height}); 247 $self->{render_cb}->($self, $self->{w}, $self->{h});
248
178 } else { 249 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 250 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
180 $pb->write ($self->{image}); 251 = CFClient::load_image_inline $self->{image};
181 $pb->close;
182
183 $pb = $pb->get_pixbuf;
184 $pb = $pb->add_alpha (0, 0, 0, 0);
185
186 $self->{width} = $pb->get_width;
187 $self->{height} = $pb->get_height;
188
189 $data = $pb->get_pixels;
190 } 252 }
191 253
192 my ($tw, $th) = @$self{qw(width height)}; 254 my ($tw, $th) = @$self{qw(w h)};
255
256 unless ($tw > 0 && $th > 0) {
257 $tw = $th = 1;
258 $data = "\x00" x 64;
259 }
260
261 $self->{minified} = [CFClient::average $tw, $th, $data]
262 if $self->{minify};
193 263
194 unless ($GL_NPOT) { 264 unless ($GL_NPOT) {
265 # TODO: does not work for zero-sized textures
195 $tw = topot $tw; 266 $tw = topot $tw;
196 $th = topot $th; 267 $th = topot $th;
197 268
198 if (defined $data) { 269 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
199 my $bpp = (length $data) / ($self->{width} * $self->{height}); 270 my $bpp = (length $data) / ($self->{w} * $self->{h});
200 $data = pack "(a" . ($tw * $bpp) . ")*", 271 $data = pack "(a" . ($tw * $bpp) . ")*",
201 unpack "(a" . ($self->{width} * $bpp) . ")*", $data; 272 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height}); 273 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 274 }
204 } 275 }
205 276
206 $self->{s} = $self->{width} / $tw; 277 $self->{s} = $self->{w} / $tw;
207 $self->{t} = $self->{height} / $th; 278 $self->{t} = $self->{h} / $th;
208 279
209 $self->{name} ||= (glGenTextures 1)->[0]; 280 $self->{name} ||= glGenTexture;
210 281
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 282 glBindTexture GL_TEXTURE_2D, $self->{name};
212 283
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 284 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 285 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
286
287 if ($::FAST) {
288 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
289 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291 # alternatively check for 0x8191
292 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
295 } else {
296 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
297 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
298 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
299 }
217 300
218 glGetError; 301 glGetError;
302
219 if (defined $data) { 303 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 304 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 305 $self->{internalformat},
222 $tw, $th, # need to pad texture first 306 $tw, $th, # need to pad texture first
223 0, 307 0,
224 $self->{format}, 308 $self->{format},
225 GL_UNSIGNED_BYTE, 309 $self->{type},
226 $data; 310 $data;
227 glGetError and die; 311 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
312 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
228 } else { 313 } else {
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 314 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 315 $self->{internalformat},
231 0, 0, 316 0, 0,
232 $tw, $th, 317 $tw, $th,
233 0; 318 0;
234 glPopmatrix; 319 CFClient::gl_check "copying to texture %dx%d if=%x",
320 $tw, $th, $self->{internalformat};
235 } 321 }
236} 322}
237 323
238sub DESTROY { 324sub DESTROY {
239 my ($self) = @_; 325 my ($self) = @_;
240 326
241 return unless exists $self->{name}; 327 delete $TEXTURES{$self+0};
242 328
243 glDeleteTextures delete $self->{name}; 329 glDeleteTexture delete $self->{name}
330 if $self->{name};
244} 331}
245 332
246sub restore_state{ 333sub restore_state{
247 $_->upload 334 $_->upload
248 for grep $_, @textures; 335 for values %TEXTURES;
249}; 336};
250 337
2511; 3381;
252 339
253=back 340=back

Diff Legend

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