Default springiness, allow springiness on non-blended meshes.

Andrzej Kapolka committed 13 years ago

Commit 60306af1 parent 506f6673 files · +14 −5Browse files

Showing the changes to interface/src/renderer/GeometryCache.cpp (1 of 3 files). Show all

Unified · Split

interface/src/renderer/GeometryCache.cpp+1−1

@@ -346,7 +346,7 @@ void NetworkGeometry::maybeReadModelWithMapping() { · 345 unmodified lines
346	glGenBuffers(1, &networkMesh.vertexBufferID);	346	glGenBuffers(1, &networkMesh.vertexBufferID);
347	glBindBuffer(GL_ARRAY_BUFFER, networkMesh.vertexBufferID);	347	glBindBuffer(GL_ARRAY_BUFFER, networkMesh.vertexBufferID);
348		348
349	if (mesh.blendshapes.isEmpty()) {	349	if (mesh.blendshapes.isEmpty() && mesh.springiness == 0.0f) {
350	glBufferData(GL_ARRAY_BUFFER, (mesh.vertices.size() + mesh.normals.size()) * sizeof(glm::vec3) +	350	glBufferData(GL_ARRAY_BUFFER, (mesh.vertices.size() + mesh.normals.size()) * sizeof(glm::vec3) +
351	mesh.texCoords.size() * sizeof(glm::vec2), NULL, GL_STATIC_DRAW);	351	mesh.texCoords.size() * sizeof(glm::vec2), NULL, GL_STATIC_DRAW);
352	glBufferSubData(GL_ARRAY_BUFFER, 0, mesh.vertices.size() * sizeof(glm::vec3), mesh.vertices.constData());	352	glBufferSubData(GL_ARRAY_BUFFER, 0, mesh.vertices.size() * sizeof(glm::vec3), mesh.vertices.constData());