History

bringing the blendshape in skin shader only work in master

sam gateau committed 8 years ago

Commit ec6117e1 parent d76880935 files · +141 −198Browse files

Showing the changes to libraries/render-utils/src/CauterizedModel.cpp (1 of 35 files). Show all

Unified · Split

libraries/render-utils/src/CauterizedModel.cpp+3−3
@@ -86,7 +86,7 @@ void CauterizedModel::createRenderItemSet() { · 85 unmodified lines
8686 // Create the render payloads
8787 int numParts = (int)mesh->getNumParts();
8888 for (int partIndex = 0; partIndex < numParts; partIndex++) {
89− if (!fbxGeometry.meshes[i].blendshapes.empty() && _blendedVertexBuffers.find(i) == _blendedVertexBuffers.end()) {
89+ if (_blendshapeBuffers.find(i) == _blendshapeBuffers.end()) {
9090 initializeBlendshapes(fbxGeometry.meshes[i], i);
9191 }
9292 auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
@@ -97,7 +97,7 @@ void CauterizedModel::createRenderItemSet() { · 4 unmodified lines
9797 shapeID++;
9898 }
9999 }
100− _blendedVertexBuffersInitialized = true;
100+ _blendshapeBuffersInitialized = true;
101101 } else {
102102 Model::createRenderItemSet();
103103 }
@@ -176,7 +176,7 @@ void CauterizedModel::updateClusterMatrices() { · 72 unmodified lines
176176
177177 // post the blender if we're not currently waiting for one to finish
178178 auto modelBlender = DependencyManager::get<ModelBlender>();
179− if (_blendedVertexBuffersInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
179+ if (_blendshapeBuffersInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
180180 _blendedBlendshapeCoefficients = _blendshapeCoefficients;
181181 modelBlender->noteRequiresBlend(getThisPointer());
182182 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t