StelVertexArray.cpp   StelVertexArray.cpp 
skipping to change at line 103 skipping to change at line 103
{ {
ret.indices << i << i+1 << i +2; ret.indices << i << i+1 << i +2;
} }
} }
break; break;
default: default:
Q_ASSERT(false); Q_ASSERT(false);
} }
} }
// Just in case we don't have any triangles, we also remove all the vertex. // Just in case we don't have any triangles, we also remove all the vertices.
// This is because we can't specify an empty indexed VertexArray. // This is because we can't specify an empty indexed VertexArray.
// FIXME: we should use an attribute for indexed array. // FIXME: we should use an attribute for indexed array.
if (ret.indices.isEmpty()) if (ret.indices.isEmpty())
ret.vertex.clear(); ret.vertex.clear();
ret.primitiveType = Triangles; ret.primitiveType = Triangles;
return ret; return ret;
} }
QDataStream& operator<<(QDataStream& out, const StelVertexArray& p) QDataStream& operator<<(QDataStream& out, const StelVertexArray& p)
{ {
out << p.vertex; out << p.vertex;
out << p.texCoords; out << p.texCoords;
out << p.colors; // GZ NEW
out << p.indices; out << p.indices;
out << (unsigned int)p.primitiveType; out << (unsigned int)p.primitiveType;
return out; return out;
} }
QDataStream& operator>>(QDataStream& in, StelVertexArray& p) QDataStream& operator>>(QDataStream& in, StelVertexArray& p)
{ {
in >> p.vertex; in >> p.vertex;
in >> p.texCoords; in >> p.texCoords;
in >> p.colors; // GZ NEW
in >> p.indices; in >> p.indices;
unsigned int t; unsigned int t;
in >> t; in >> t;
p.primitiveType=(StelVertexArray::StelPrimitiveType)t; p.primitiveType=(StelVertexArray::StelPrimitiveType)t;
return in; return in;
} }
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/