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.26 by root, Wed Apr 12 02:00:06 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 SDL::OpenGL;
23 25
24our %GL_EXT; 26our %GL_EXT;
25our $GL_VERSION; 27our $GL_VERSION;
26 28
27our $GL_NPOT; 29our $GL_NPOT;
… …
30 $GL_VERSION = gl_version * 1; 32 $GL_VERSION = gl_version * 1;
31 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions; 33 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
32 34
33 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2; 35 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
34 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
35 Crossfire::Client::Texture::restore_state (); 47 CFClient::Texture::restore_state ();
36} 48}
37 49
38sub find_rcfile($) { 50sub find_rcfile($) {
39 my $path; 51 my $path;
40 52
41 for (@INC) { 53 for (@INC) {
42 $path = "$_/Crossfire/resources/$_[0]"; 54 $path = "$_/CFClient/resources/$_[0]";
43 return $path if -r $path; 55 return $path if -r $path;
44 } 56 }
45 57
46 die "FATAL: can't find required file $_[0]\n"; 58 die "FATAL: can't find required file $_[0]\n";
47} 59}
… …
76 } 88 }
77 89
78 close CFG; 90 close CFG;
79} 91}
80 92
81package Crossfire::Client::Texture; 93package CFClient::Texture;
94
95use strict;
82 96
83use Scalar::Util; 97use Scalar::Util;
84 98
85use SDL::OpenGL; 99use SDL::OpenGL;
86 100
… …
124# 138#
125# $surface->rgba; 139# $surface->rgba;
126# 140#
127# $class->new ( 141# $class->new (
128# data => $surface->pixels, 142# data => $surface->pixels,
129# width => $surface->width, 143# w => $surface->width,
130# height => $surface->height, 144# h => $surface->height,
131# ) 145# )
132#} 146#}
133 147
134sub new_from_text { 148sub new_from_layout {
135 my ($class, $text, $height) = @_; 149 my ($class, $layout) = @_;
136 150
137 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height; 151 my ($w, $h, $data) = $layout->render;
138 152
139 $class->new ( 153 $class->new (
140 width => $w, 154 w => $w,
141 height => $h, 155 h => $h,
142 data => $data, 156 data => $data,
143 internalformat => GL_ALPHA4, 157 internalformat => GL_ALPHA4,
144 format => GL_ALPHA, 158 format => GL_ALPHA,
145 ) 159 )
146} 160}
147 161
148sub new_from_opengl { 162sub new_from_opengl {
149 my ($class, $w, $h, $cb) = @_; 163 my ($class, $w, $h, $cb) = @_;
150 164
151 $class->new (width => $w, height => $h, rendercb => $cb) 165 $class->new (w => $w, h => $h, render_cb => $cb)
152} 166}
153 167
154sub topot { 168sub topot {
155 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 169 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
156} 170}
… …
162 176
163 my $data; 177 my $data;
164 178
165 if (exists $self->{data}) { 179 if (exists $self->{data}) {
166 $data = $self->{data}; 180 $data = $self->{data};
181
167 } elsif (exists $self->{rendercb}) { 182 } elsif (exists $self->{render_cb}) {
168 glViewport 0, 0, $self->{width}, $self->{height}; 183 glViewport 0, 0, $self->{w}, $self->{h};
184 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
169 glMatrixMode GL_PROJECTION; 185 glMatrixMode GL_PROJECTION;
170 glLoadIdentity; 186 glLoadIdentity;
171 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
172 glMatrixMode GL_MODELVIEW; 187 glMatrixMode GL_MODELVIEW;
173 glPushmatrix;
174 glLoadIdentity; 188 glLoadIdentity;
175 glClear GL_COLOR_BUFFER_BIT; 189 glClear GL_COLOR_BUFFER_BIT;
176
177 $self->{rendercb}->($self, $self->{width}, $self->{height}); 190 $self->{render_cb}->($self, $self->{w}, $self->{h});
191
178 } else { 192 } else {
179 my $pb = new Gtk2::Gdk::PixbufLoader; 193 my $pb = new Gtk2::Gdk::PixbufLoader;
180 $pb->write ($self->{image}); 194 $pb->write ($self->{image});
181 $pb->close; 195 $pb->close;
182 196
183 $pb = $pb->get_pixbuf; 197 $pb = $pb->get_pixbuf;
184 $pb = $pb->add_alpha (0, 0, 0, 0); 198 $pb = $pb->add_alpha (0, 0, 0, 0);
185 199
186 $self->{width} = $pb->get_width; 200 $self->{w} = $pb->get_width;
187 $self->{height} = $pb->get_height; 201 $self->{h} = $pb->get_height;
188 202
189 $data = $pb->get_pixels; 203 $data = $pb->get_pixels;
190 } 204 }
191 205
192 my ($tw, $th) = @$self{qw(width height)}; 206 my ($tw, $th) = @$self{qw(w h)};
207
208 unless ($tw && $th) {
209 $tw = $th = 1;
210 $data = "\x00" x 64;
211 }
193 212
194 unless ($GL_NPOT) { 213 unless ($GL_NPOT) {
214 # TODO: does not work for zero-sized textures
195 $tw = topot $tw; 215 $tw = topot $tw;
196 $th = topot $th; 216 $th = topot $th;
197 217
198 if (defined $data) { 218 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
199 my $bpp = (length $data) / ($self->{width} * $self->{height}); 219 my $bpp = (length $data) / ($self->{w} * $self->{h});
200 $data = pack "(a" . ($tw * $bpp) . ")*", 220 $data = pack "(a" . ($tw * $bpp) . ")*",
201 unpack "(a" . ($self->{width} * $bpp) . ")*", $data; 221 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
202 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{height}); 222 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
203 } 223 }
204 } 224 }
205 225
206 $self->{s} = $self->{width} / $tw; 226 $self->{s} = $self->{w} / $tw;
207 $self->{t} = $self->{height} / $th; 227 $self->{t} = $self->{h} / $th;
208 228
209 $self->{name} ||= (glGenTextures 1)->[0]; 229 $self->{name} ||= (glGenTextures 1)->[0];
210 230
211 glBindTexture GL_TEXTURE_2D, $self->{name}; 231 glBindTexture GL_TEXTURE_2D, $self->{name};
212 232
213 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; 233 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 234 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
215 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 235 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
216 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 236 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
217 237
218 glGetError;
219 if (defined $data) { 238 if (defined $data) {
220 glTexImage2D GL_TEXTURE_2D, 0, 239 glTexImage2D GL_TEXTURE_2D, 0,
221 $self->{internalformat}, 240 $self->{internalformat},
222 $tw, $th, # need to pad texture first 241 $tw, $th, # need to pad texture first
223 0, 242 0,
… …
229 glCopyTexImage2D GL_TEXTURE_2D, 0, 248 glCopyTexImage2D GL_TEXTURE_2D, 0,
230 $self->{internalformat}, 249 $self->{internalformat},
231 0, 0, 250 0, 0,
232 $tw, $th, 251 $tw, $th,
233 0; 252 0;
234 glPopmatrix; 253 glGetError and die;
235 } 254 }
236} 255}
237 256
238sub DESTROY { 257sub DESTROY {
239 my ($self) = @_; 258 my ($self) = @_;

Diff Legend

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