TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

a few checks against bad data

Browse Source
This commit is contained in:
David Rose 2011-12-29 22:23:14 +00:00
parent b5eeced04a
commit 1c9395b311
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/grutil/pfmFile.I
View File

@ -109,6 +109,7 @@ get_point(int x, int y) const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void PfmFile:: INLINE void PfmFile::
set_point(int x, int y, const LVecBase3 &point) { set_point(int x, int y, const LVecBase3 &point) {
nassertv(!point.is_nan());
nassertv(x >= 0 && x < _x_size); nassertv(x >= 0 && x < _x_size);
nassertv(y >= 0 && y < _y_size); nassertv(y >= 0 && y < _y_size);
_table[y * _x_size + x] = point; _table[y * _x_size + x] = point;

11
panda/src/grutil/pfmFile.cxx
View File

@ -208,7 +208,9 @@ read(istream &in) {
LittleEndian value(&data, sizeof(data)); LittleEndian value(&data, sizeof(data));
PN_float32 result; PN_float32 result;
value.store_value(&result, sizeof(result)); value.store_value(&result, sizeof(result));
point[ci] = result; if (!cnan(result)) {
point[ci] = result;
}
} }
_table.push_back(point); _table.push_back(point);
} }
@ -221,7 +223,9 @@ read(istream &in) {
BigEndian value(&data, sizeof(data)); BigEndian value(&data, sizeof(data));
PN_float32 result; PN_float32 result;
value.store_value(&result, sizeof(result)); value.store_value(&result, sizeof(result));
point[ci] = result; if (!cnan(result)) {
point[ci] = result;
}
} }
_table.push_back(point); _table.push_back(point);
} }
@ -841,7 +845,7 @@ make_vis_mesh_geom(GeomNode *gnode, bool inverted) const {
for (int xi = x_begin; xi < x_end; ++xi) { for (int xi = x_begin; xi < x_end; ++xi) {
const LPoint3 &point = get_point(xi, yi); const LPoint3 &point = get_point(xi, yi);
LPoint2 uv(PN_stdfloat(xi) / PN_stdfloat(_x_size - 1), LPoint2 uv(PN_stdfloat(xi) / PN_stdfloat(_x_size - 1),
PN_stdfloat(yi) / PN_stdfloat(_y_size - 1)); PN_stdfloat(yi) / PN_stdfloat(_y_size - 1));
if (_vis_inverse) { if (_vis_inverse) {
vertex.add_data2(uv); vertex.add_data2(uv);
@ -879,6 +883,7 @@ make_vis_mesh_geom(GeomNode *gnode, bool inverted) const {
n[2] += v0[0] * v1[1] - v0[1] * v1[0]; n[2] += v0[0] * v1[1] - v0[1] * v1[0];
} }
n.normalize(); n.normalize();
nassertv(!n.is_nan());
if (inverted) { if (inverted) {
n = -n; n = -n;
} }