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

fix mins/maxs

Browse Source
This commit is contained in:
David Rose 2005-04-15 16:29:14 +00:00
parent 4f47bf53e7
commit 35f994c384
6 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2520,7 +2520,8 @@ draw_tristrips(const qpGeomTristrips *primitive) {
qpGeomVertexReader mins(primitive->get_mins(), 0); qpGeomVertexReader mins(primitive->get_mins(), 0);
qpGeomVertexReader maxs(primitive->get_mins(), 0); qpGeomVertexReader maxs(primitive->get_mins(), 0);
nassertv(mins.get_num_vertices() == ends.size() && maxs.get_num_vertices() == ends.size()); nassertv(mins.get_num_vertices() == (int)ends.size() &&
maxs.get_num_vertices() == (int)ends.size());
unsigned int start = 0; unsigned int start = 0;
for (size_t i = 0; i < ends.size(); i++) { for (size_t i = 0; i < ends.size(); i++) {
@ -2553,7 +2554,8 @@ draw_trifans(const qpGeomTrifans *primitive) {
qpGeomVertexReader mins(primitive->get_mins(), 0); qpGeomVertexReader mins(primitive->get_mins(), 0);
qpGeomVertexReader maxs(primitive->get_mins(), 0); qpGeomVertexReader maxs(primitive->get_mins(), 0);
nassertv(mins.get_num_vertices() == ends.size() && maxs.get_num_vertices() == ends.size()); nassertv(mins.get_num_vertices() == (int)ends.size() &&
maxs.get_num_vertices() == (int)ends.size());
unsigned int start = 0; unsigned int start = 0;
for (size_t i = 0; i < ends.size(); i++) { for (size_t i = 0; i < ends.size(); i++) {

4
panda/src/gobj/qpgeomPrimitive.cxx
View File

@ -983,14 +983,14 @@ recompute_minmax(qpGeomPrimitive::CDWriter &cdata) {
} else { } else {
min_prim = min(min_prim, vertex); min_prim = min(min_prim, vertex);
max_prim = min(max_prim, vertex); max_prim = max(max_prim, vertex);
} }
++vi; ++vi;
} }
mins.add_data1i(min_prim); mins.add_data1i(min_prim);
maxs.add_data1i(max_prim); maxs.add_data1i(max_prim);
nassertv(mins.get_num_vertices() == cdata->_ends.size()); nassertv(mins.get_num_vertices() == (int)cdata->_ends.size());
} else { } else {
// This is a simple primitive type like a triangle; just compute // This is a simple primitive type like a triangle; just compute

4
panda/src/gobj/qpgeomPrimitive.h
View File

@ -208,8 +208,8 @@ private:
UpdateSeq _modified; UpdateSeq _modified;
bool _got_minmax; bool _got_minmax;
unsigned short _min_vertex; unsigned int _min_vertex;
unsigned short _max_vertex; unsigned int _max_vertex;
}; };
PipelineCycler<CData> _cycler; PipelineCycler<CData> _cycler;

2
panda/src/gobj/qpgeomTristrips.cxx
View File

@ -242,8 +242,6 @@ rotate_impl() const {
qpGeomVertexReader from(vertices, 0); qpGeomVertexReader from(vertices, 0);
qpGeomVertexWriter to(new_vertices, 0); qpGeomVertexWriter to(new_vertices, 0);
bool any_odd = false;
int begin = 0; int begin = 0;
int last_added = 0; int last_added = 0;
CPTA_int::const_iterator ei; CPTA_int::const_iterator ei;

9
panda/src/gobj/qpgeomVertexData.cxx
View File

@ -1125,15 +1125,10 @@ do_set_num_vertices(int n, qpGeomVertexData::CDWriter &cdata) {
case NT_packed_dcba: case NT_packed_dcba:
case NT_packed_dabc: case NT_packed_dabc:
case NT_uint8: case NT_uint8:
while (pointer < stop) {
memset(pointer, 0xff, num_values);
pointer += stride;
}
break;
case NT_uint16: case NT_uint16:
case NT_uint32:
while (pointer < stop) { while (pointer < stop) {
memset(pointer, 0xff, num_values * 2); memset(pointer, 0xff, column->get_total_bytes());
pointer += stride; pointer += stride;
} }
break; break;

1
panda/src/gobj/qpgeomVertexWriter.cxx
View File

@ -465,7 +465,6 @@ set_data1i(unsigned char *pointer, int a) {
case NT_uint32: case NT_uint32:
*(PN_uint32 *)pointer = a; *(PN_uint32 *)pointer = a;
nassertv(*(PN_uint32 *)pointer == a);
break; break;
case NT_packed_dcba: case NT_packed_dcba: