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.19 by root, Mon Apr 10 19:34:03 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# $GL_NPOT=0;#d#
38}
39
40sub find_rcfile($) {
41 my $path;
42
43 for (@INC) {
44 $path = "$_/Crossfire/resources/$_[0]";
45 return $path if -r $path;
46 }
47
48 die "FATAL: can't find required file $_[0]\n";
49}
50
51sub read_cfg {
52 my ($file) = @_;
53
54 open CFG, $file
55 or return;
56
57 my $CFG;
58
59 local $/;
60 $CFG = eval <CFG>;
61
62 $::CFG = $CFG;
63
64 close CFG;
65}
66
67sub write_cfg {
68 my ($file) = @_;
69
70 open CFG, ">$file"
71 or return;
72
73 {
74 require Data::Dumper;
75 local $Data::Dumper::Purity = 1;
76 $::CFG->{VERSION} = $::VERSION;
77 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
78 }
79
80 close CFG;
81}
82
24package Crossfire::Client::Texture; 83package Crossfire::Client::Texture;
25 84
26use Scalar::Util; 85use Scalar::Util;
27 86
28use SDL::OpenGL; 87use SDL::OpenGL;
29 88
30my @textures; 89my @textures;
31 90
32sub _new { 91sub new {
33 my ($class, %data) = @_; 92 my ($class, %data) = @_;
34 93
35 my $self = bless \%data, $class; 94 my $self = bless {
95 internalformat => GL_RGBA,
96 format => GL_RGBA,
97 %data,
98 }, $class;
36 99
37 push @textures, $self; 100 push @textures, $self;
38 Scalar::Util::weaken $textures[-1]; 101 Scalar::Util::weaken $textures[-1];
39 102
40 $self->upload; 103 $self->upload;
… …
43} 106}
44 107
45sub new_from_image { 108sub new_from_image {
46 my ($class, $image) = @_; 109 my ($class, $image) = @_;
47 110
48 $class->_new (image => $image) 111 $class->new (image => $image)
49} 112}
50 113
51sub new_from_file { 114sub new_from_file {
52 my ($class, $path) = @_; 115 my ($class, $path) = @_;
53 116
… …
56 119
57 local $/; 120 local $/;
58 $class->new_from_image (<$fh>) 121 $class->new_from_image (<$fh>)
59} 122}
60 123
61sub new_from_surface { 124#sub new_from_surface {
62 my ($class, $surface) = @_; 125# my ($class, $surface) = @_;
63 126#
64 $surface->rgba; 127# $surface->rgba;
65 128#
66 $class->_new ( 129# $class->new (
67 data => $surface->pixels, 130# data => $surface->pixels,
68 width => $surface->width, 131# width => $surface->width,
69 height => $surface->height, 132# height => $surface->height,
133# )
134#}
135
136sub new_from_text {
137 my ($class, $text, $height) = @_;
138
139 my ($w, $h, $data) = Crossfire::Client::font_render $text, $height;
140
141 $class->new (
142 width => $w,
143 height => $h,
144 data => $data,
145 internalformat => GL_ALPHA4,
146 format => GL_ALPHA,
70 ) 147 )
148}
149
150sub new_from_opengl {
151 my ($class, $w, $h, $cb) = @_;
152
153 $class->new (width => $w, height => $h, rendercb => $cb)
154}
155
156sub topot {
157 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
71} 158}
72 159
73sub upload { 160sub upload {
74 my ($self) = @_; 161 my ($self) = @_;
75 162
76 return unless $SDL::App::USING_OPENGL; 163 return unless $SDL::App::USING_OPENGL;
77 164
78 my ($data, $width, $height); 165 my $data;
79 166
80 if (exists $self->{data}) { 167 if (exists $self->{data}) {
81 ($data, $width, $height) = ($self->{data}, $self->{width}, $self->{height}); 168 $data = $self->{data};
169 } elsif (exists $self->{rendercb}) {
170 glViewport 0, 0, $self->{width}, $self->{height};
171 glMatrixMode GL_PROJECTION;
172 glLoadIdentity;
173 glOrtho 0, $self->{width}, 0, $self->{height}, -10000, 10000;
174 glMatrixMode GL_MODELVIEW;
175 glPushmatrix;
176 glLoadIdentity;
177 glClear GL_COLOR_BUFFER_BIT;
178
179 $self->{rendercb}->($self, $self->{width}, $self->{height});
82 } else { 180 } else {
83 my $pb = new Gtk2::Gdk::PixbufLoader; 181 my $pb = new Gtk2::Gdk::PixbufLoader;
84 $pb->write ($self->{image}); 182 $pb->write ($self->{image});
85 $pb->close; 183 $pb->close;
86 184
87 $pb = $pb->get_pixbuf; 185 $pb = $pb->get_pixbuf;
88 $pb = $pb->add_alpha (0, 0, 0, 0); 186 $pb = $pb->add_alpha (0, 0, 0, 0);
89 187
90 ($data, $width, $height) = ($pb->get_pixels, $pb->get_width, $pb->get_height); 188 $self->{width} = $pb->get_width;
91 } 189 $self->{height} = $pb->get_height;
92 190
191 $data = $pb->get_pixels;
192 }
193
194 my ($tw, $th) = @$self{qw(width height)};
195
196 unless ($NPOT) {
197 $tw = topot $tw;
198 $th = topot $th;
199
200 if (defined $data) {
201 $data = pack "(a$tw)*", (unpack "(a$self->{width})*", $data);
202 $data .= ("\x00" x $tw) x ($th - $self->{height});
203 }
204 }
205
206 $self->{u} = $self->{width} / $tw;
207 $self->{v} = $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_NEAREST;
98 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; 214 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;#_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