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

Diff Legend

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