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.20 by root, Mon Apr 10 22:16:33 2006 UTC

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

Diff Legend

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