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.4 by root, Fri Apr 7 18:49:52 2006 UTC vs.
Revision 1.29 by root, Wed Apr 12 20:42:52 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 23
24use SDL::OpenGL;
25
26our %GL_EXT;
27our $GL_VERSION;
28
29our $GL_NPOT;
30
31sub gl_init {
32 $GL_VERSION = gl_version * 1;
33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
34
35 $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 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
47 CFClient::Texture::restore_state ();
48}
49
50sub find_rcfile($) {
51 my $path;
52
53 for (@INC) {
54 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path;
56 }
57
58 die "FATAL: can't find required file $_[0]\n";
59}
60
61sub read_cfg {
62 my ($file) = @_;
63
64 open CFG, $file
65 or return;
66
67 my $CFG;
68
69 local $/;
70 $CFG = eval <CFG>;
71
72 $::CFG = $CFG;
73
74 close CFG;
75}
76
77sub write_cfg {
78 my ($file) = @_;
79
80 open CFG, ">$file"
81 or return;
82
83 {
84 require Data::Dumper;
85 local $Data::Dumper::Purity = 1;
86 $::CFG->{VERSION} = $::VERSION;
87 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
88 }
89
90 close CFG;
91}
92
24package Crossfire::Client::Texture; 93package CFClient::Texture;
94
95use strict;
25 96
26use Scalar::Util; 97use Scalar::Util;
27 98
28use SDL::OpenGL; 99use SDL::OpenGL;
29 100
30my @textures; 101my @textures;
31 102
32sub _new { 103sub new {
33 my ($class, %data) = @_; 104 my ($class, %data) = @_;
34 105
35 my $self = bless \%data, $class; 106 my $self = bless {
107 internalformat => GL_RGBA,
108 format => GL_RGBA,
109 type => GL_UNSIGNED_BYTE,
110 %data,
111 }, $class;
36 112
37 push @textures, $self; 113 push @textures, $self;
38 Scalar::Util::weaken $textures[-1]; 114 Scalar::Util::weaken $textures[-1];
39 115
40 $self->upload; 116 $self->upload;
… …
43} 119}
44 120
45sub new_from_image { 121sub new_from_image {
46 my ($class, $image) = @_; 122 my ($class, $image) = @_;
47 123
48 $class->_new (image => $image) 124 $class->new (image => $image)
49} 125}
50 126
51sub new_from_file { 127sub new_from_file {
52 my ($class, $path) = @_; 128 my ($class, $path) = @_;
53 129
… …
56 132
57 local $/; 133 local $/;
58 $class->new_from_image (<$fh>) 134 $class->new_from_image (<$fh>)
59} 135}
60 136
61sub new_from_surface { 137#sub new_from_surface {
62 my ($class, $surface) = @_; 138# my ($class, $surface) = @_;
63 139#
64 $surface->rgba; 140# $surface->rgba;
65 141#
66 $class->_new ( 142# $class->new (
67 data => $surface->pixels, 143# data => $surface->pixels,
68 width => $surface->width, 144# w => $surface->width,
69 height => $surface->height, 145# h => $surface->height,
146# )
147#}
148
149sub new_from_layout {
150 my ($class, $layout) = @_;
151
152 my ($w, $h, $data) = $layout->render;
153
154 $class->new (
155 w => $w,
156 h => $h,
157 data => $data,
158 internalformat => GL_ALPHA4,
159 format => GL_ALPHA,
160 type => GL_UNSIGNED_BYTE,
70 ) 161 )
162}
163
164sub new_from_opengl {
165 my ($class, $w, $h, $cb) = @_;
166
167 $class->new (w => $w, h => $h, render_cb => $cb)
168}
169
170sub topot {
171 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
71} 172}
72 173
73sub upload { 174sub upload {
74 my ($self) = @_; 175 my ($self) = @_;
75 176
76 return unless $SDL::App::USING_OPENGL; 177 return unless $GL_VERSION;
77 178
78 my ($data, $width, $height); 179 my $data;
79 180
80 if (exists $self->{data}) { 181 if (exists $self->{data}) {
81 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 182 $data = $self->{data};
183
184 } elsif (exists $self->{render_cb}) {
185 glViewport 0, 0, $self->{w}, $self->{h};
186 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
187 glMatrixMode GL_PROJECTION;
188 glLoadIdentity;
189 glMatrixMode GL_MODELVIEW;
190 glLoadIdentity;
191 glClear GL_COLOR_BUFFER_BIT;
192 $self->{render_cb}->($self, $self->{w}, $self->{h});
193
82 } else { 194 } else {
83 my $pb = new Gtk2::Gdk::PixbufLoader; 195 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
84 $pb->write ($self->{image}); 196 = CFClient::load_image_inline $self->{image};
85 $pb->close;
86
87 $pb = $pb->get_pixbuf;
88 $pb = $pb->add_alpha (0, 0, 0, 0);
89
90 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height);
91 } 197 }
92 198
199 my ($tw, $th) = @$self{qw(w h)};
200
201 unless ($tw && $th) {
202 $tw = $th = 1;
203 $data = "\x00" x 64;
204 }
205
206 unless ($GL_NPOT) {
207 # TODO: does not work for zero-sized textures
208 $tw = topot $tw;
209 $th = topot $th;
210
211 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
212 my $bpp = (length $data) / ($self->{w} * $self->{h});
213 $data = pack "(a" . ($tw * $bpp) . ")*",
214 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
215 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
216 }
217 }
218
219 $self->{s} = $self->{w} / $tw;
220 $self->{t} = $self->{h} / $th;
221
93 ($self->{name}) = @{glGenTextures 1}; 222 $self->{name} ||= (glGenTextures 1)->[0];
94 223
95 glBindTexture GL_TEXTURE_2D, $self->{name}; 224 glBindTexture GL_TEXTURE_2D, $self->{name};
96 225
97 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 226 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
98 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 227 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
99 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 228 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
100 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 229 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
101 230
231 if (defined $data) {
102 glTexImage2D GL_TEXTURE_2D, 0, 232 glTexImage2D GL_TEXTURE_2D, 0,
103 GL_RGBA8, 233 $self->{internalformat},
104 $width, $height, 234 $tw, $th, # need to pad texture first
105 0, 235 0,
106 GL_RGBA, 236 $self->{format},
107 GL_UNSIGNED_BYTE, 237 $self->{type},
108 $data; 238 $data;
239 glGetError and die;
240 } else {
241 glCopyTexImage2D GL_TEXTURE_2D, 0,
242 $self->{internalformat},
243 0, 0,
244 $tw, $th,
245 0;
246 glGetError and die;
247 }
109} 248}
110 249
111sub DESTROY { 250sub DESTROY {
112 my ($self) = @_; 251 my ($self) = @_;
113 252
114 return unless exists $self->{name}; 253 return unless exists $self->{name};
115 254
116 glDeleteTextures delete $self->{name}; 255 glDeleteTextures delete $self->{name};
117} 256}
118 257
119push @::GLINIT, sub { 258sub restore_state{
120 $_->upload 259 $_->upload
121 for grep $_, @textures; 260 for grep $_, @textures;
122}; 261};
123 262
1241; 2631;

Diff Legend

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