RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix fog on sprite particles

This commit is contained in:
David Rose 2006-05-12 18:06:22 +00:00
parent 42b6f9ed25
commit 66d179ecdf
3 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/pgraph/config_pgraph.cxx
View File

@ -177,6 +177,16 @@ ConfigVariableBool state_cache
"similar to the TransformState cache controlled via "
"transform-cache."));
ConfigVariableBool retransform_sprites
("retransform-sprites", true,
PRC_DESC("To render sprite-based particle effects, Panda must convert "
"the sprite points from object space into clip space, and compute "
"the corners of the quads in clip space. When this variable is "
"false, the resulting quads are then sent to the graphics "
"hardware in clip space. When this is true, the quads are "
"re-transformed back into the original object space, which is "
"necessary in order for fog to work correctly on the sprites."));
ConfigVariableInt max_collect_vertices
("max-collect-vertices", 1024,
PRC_DESC("Specifies the maximum number of vertices that are allowed to be "

1
panda/src/pgraph/config_pgraph.h
View File

@ -45,6 +45,7 @@ extern ConfigVariableBool paranoid_const;
extern ConfigVariableBool auto_break_cycles;
extern ConfigVariableBool transform_cache;
extern ConfigVariableBool state_cache;
extern ConfigVariableBool retransform_sprites;
extern ConfigVariableInt max_collect_vertices;
extern ConfigVariableInt max_collect_indices;

72
panda/src/pgraph/cullableObject.cxx
View File

@ -228,10 +228,22 @@ munge_points_to_quads(const CullTraverser *traverser) {
}
}
PT(GeomVertexArrayFormat) new_array_format =
new GeomVertexArrayFormat(InternalName::get_vertex(), 4,
Geom::NT_float32,
Geom::C_clip_point);
PT(GeomVertexArrayFormat) new_array_format;
if (retransform_sprites) {
// With retransform_sprites in effect, we will be sending ordinary
// 3-D points to the graphics API.
new_array_format =
new GeomVertexArrayFormat(InternalName::get_vertex(), 3,
Geom::NT_float32,
Geom::C_point);
} else {
// Without retransform_sprites, we will be sending 4-component
// clip-space points.
new_array_format =
new GeomVertexArrayFormat(InternalName::get_vertex(), 4,
Geom::NT_float32,
Geom::C_clip_point);
}
if (has_normal) {
const GeomVertexColumn *c = normal.get_column();
new_array_format->add_column
@ -303,12 +315,9 @@ munge_points_to_quads(const CullTraverser *traverser) {
projection;
}
// We will need the composite render transform to compute the
// lighting normal.
LMatrix4f render_transform;
if (has_normal) {
render_transform = modelview * projection;
}
LMatrix4f render_transform = modelview * projection;
LMatrix4f inv_render_transform;
inv_render_transform.invert_from(render_transform);
// Replace each primitive in the Geom (it's presumably a GeomPoints
// primitive, although it might be some other kind of primitive if
@ -431,18 +440,39 @@ munge_points_to_quads(const CullTraverser *traverser) {
c0.set(c0[0] * rx, c0[1] * ry);
c1.set(c1[0] * rx, c1[1] * ry);
new_vertex.add_data4f(p4[0] + c0[0], p4[1] + c0[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] + c1[0], p4[1] + c1[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] - c1[0], p4[1] - c1[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] - c0[0], p4[1] - c0[1], p4[2], p4[3]);
if (retransform_sprites) {
// With retransform_sprites in effect, we must reconvert the
// resulting quad back into the original 3-D space.
new_vertex.add_data4f(inv_render_transform.xform(LPoint4f(p4[0] + c0[0], p4[1] + c0[1], p4[2], p4[3])));
new_vertex.add_data4f(inv_render_transform.xform(LPoint4f(p4[0] + c1[0], p4[1] + c1[1], p4[2], p4[3])));
new_vertex.add_data4f(inv_render_transform.xform(LPoint4f(p4[0] - c1[0], p4[1] - c1[1], p4[2], p4[3])));
new_vertex.add_data4f(inv_render_transform.xform(LPoint4f(p4[0] - c0[0], p4[1] - c0[1], p4[2], p4[3])));
if (has_normal) {
normal.set_row(*vi);
const Normalf &c = normal.get_data3f();
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
}
if (has_normal) {
normal.set_row(*vi);
Normalf c = render_transform.xform_vec(normal.get_data3f());
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
} else {
// Without retransform_sprites, we can simply load the
// clip-space coordinates.
new_vertex.add_data4f(p4[0] + c0[0], p4[1] + c0[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] + c1[0], p4[1] + c1[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] - c1[0], p4[1] - c1[1], p4[2], p4[3]);
new_vertex.add_data4f(p4[0] - c0[0], p4[1] - c0[1], p4[2], p4[3]);
if (has_normal) {
normal.set_row(*vi);
Normalf c = render_transform.xform_vec(normal.get_data3f());
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
new_normal.add_data3f(c);
}
}
if (has_color) {
color.set_row(*vi);