TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

use point_sprite extension

Browse Source
This commit is contained in:
David Rose 2005-04-22 20:40:19 +00:00
parent 521a4b625e
commit a1f1b33241
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -401,7 +401,14 @@ reset() {
_glPointParameterfv = null_glPointParameterfv; _glPointParameterfv = null_glPointParameterfv;
} }
_supports_point_sprite = false; _supports_point_sprite = has_extension("GL_ARB_point_sprite");
if (_supports_point_sprite) {
// It appears that the point_sprite extension doesn't support
// texture transforms on the generated texture coordinates. How
// inconsistent. Because of this, we don't advertise
// GR_point_sprite_tex_matrix.
_supported_geom_rendering |= qpGeom::GR_point_sprite;
}
_supports_vertex_blend = has_extension("GL_ARB_vertex_blend"); _supports_vertex_blend = has_extension("GL_ARB_vertex_blend");
@ -781,6 +788,7 @@ reset() {
_polygon_offset_enabled = false; _polygon_offset_enabled = false;
_flat_shade_model = false; _flat_shade_model = false;
_decal_level = 0; _decal_level = 0;
_tex_gen_point_sprite = false;
// Dither is on by default in GL; let's turn it off // Dither is on by default in GL; let's turn it off
GLP(Disable)(GL_DITHER); GLP(Disable)(GL_DITHER);
@ -5895,17 +5903,22 @@ finish_modify_state() {
_tex_gen_modifies_mat = false; _tex_gen_modifies_mat = false;
bool got_point_sprites = false;
for (int i = 0; i < num_stages; i++) { for (int i = 0; i < num_stages; i++) {
TextureStage *stage = _current_texture->get_on_stage(i); TextureStage *stage = _current_texture->get_on_stage(i);
_glActiveTexture(GL_TEXTURE0 + i); _glActiveTexture(GL_TEXTURE0 + i);
TexGenAttrib::Mode mode = _current_tex_gen->get_mode(stage);
switch (mode) {
case TexGenAttrib::M_off:
GLP(Disable)(GL_TEXTURE_GEN_S); GLP(Disable)(GL_TEXTURE_GEN_S);
GLP(Disable)(GL_TEXTURE_GEN_T); GLP(Disable)(GL_TEXTURE_GEN_T);
GLP(Disable)(GL_TEXTURE_GEN_R); GLP(Disable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q); GLP(Disable)(GL_TEXTURE_GEN_Q);
if (_supports_point_sprite) {
GLP(TexEnvi)(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, FALSE);
}
TexGenAttrib::Mode mode = _current_tex_gen->get_mode(stage);
switch (mode) {
case TexGenAttrib::M_off:
break; break;
case TexGenAttrib::M_eye_sphere_map: case TexGenAttrib::M_eye_sphere_map:
@ -5913,8 +5926,6 @@ finish_modify_state() {
GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP); GLP(TexGeni)(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
GLP(Enable)(GL_TEXTURE_GEN_S); GLP(Enable)(GL_TEXTURE_GEN_S);
GLP(Enable)(GL_TEXTURE_GEN_T); GLP(Enable)(GL_TEXTURE_GEN_T);
GLP(Disable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q);
force_normal = true; force_normal = true;
break; break;
@ -5946,13 +5957,7 @@ finish_modify_state() {
GLP(Enable)(GL_TEXTURE_GEN_S); GLP(Enable)(GL_TEXTURE_GEN_S);
GLP(Enable)(GL_TEXTURE_GEN_T); GLP(Enable)(GL_TEXTURE_GEN_T);
GLP(Enable)(GL_TEXTURE_GEN_R); GLP(Enable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q);
force_normal = true; force_normal = true;
} else {
GLP(Disable)(GL_TEXTURE_GEN_S);
GLP(Disable)(GL_TEXTURE_GEN_T);
GLP(Disable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q);
} }
break; break;
@ -5984,13 +5989,7 @@ finish_modify_state() {
GLP(Enable)(GL_TEXTURE_GEN_S); GLP(Enable)(GL_TEXTURE_GEN_S);
GLP(Enable)(GL_TEXTURE_GEN_T); GLP(Enable)(GL_TEXTURE_GEN_T);
GLP(Enable)(GL_TEXTURE_GEN_R); GLP(Enable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q);
force_normal = true; force_normal = true;
} else {
GLP(Disable)(GL_TEXTURE_GEN_S);
GLP(Disable)(GL_TEXTURE_GEN_T);
GLP(Disable)(GL_TEXTURE_GEN_R);
GLP(Disable)(GL_TEXTURE_GEN_Q);
} }
break; break;
@ -6067,11 +6066,22 @@ finish_modify_state() {
break; break;
case TexGenAttrib::M_point_sprite: case TexGenAttrib::M_point_sprite:
// TODO. nassertv(_supports_point_sprite);
GLP(TexEnvi)(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, TRUE);
got_point_sprites = true;
break; break;
} }
} }
if (got_point_sprites != _tex_gen_point_sprite) {
_tex_gen_point_sprite = got_point_sprites;
if (_tex_gen_point_sprite) {
GLP(Enable)(GL_POINT_SPRITE_ARB);
} else {
GLP(Disable)(GL_POINT_SPRITE_ARB);
}
}
// Certain texgen modes (sphere_map, cube_map) require forcing the // Certain texgen modes (sphere_map, cube_map) require forcing the
// normal to be sent to the GL while the texgen mode is in effect. // normal to be sent to the GL while the texgen mode is in effect.
if (force_normal != _texgen_forced_normal) { if (force_normal != _texgen_forced_normal) {

1
panda/src/glstuff/glGraphicsStateGuardian_src.h
View File

@ -318,6 +318,7 @@ protected:
CPT(TexGenAttrib) _current_tex_gen; CPT(TexGenAttrib) _current_tex_gen;
bool _needs_tex_gen; bool _needs_tex_gen;
bool _tex_gen_modifies_mat; bool _tex_gen_modifies_mat;
bool _tex_gen_point_sprite;
bool _auto_antialias_mode; bool _auto_antialias_mode;
RenderModeAttrib::Mode _render_mode; RenderModeAttrib::Mode _render_mode;
float _point_size; float _point_size;