Starting to clean the mesh part of the RenderItem....

samcake committed 11 years ago

Commit 518f5fe1 parent 00e05236 files · +58 −27Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+35−6

     int meshIndex;
     int partIndex;
     int _shapeID;
+    render::Item::Bound getBound() const {
+        if (_isBoundInvalid) {
+            model->getPartBounds(meshIndex, partIndex);
+            _isBoundInvalid = false;
+        }
+        return _bound;
+    }
+    mutable render::Item::Bound _bound;
+    mutable bool _isBoundInvalid = true;
 };
 namespace render {
     template <> const Item::Bound payloadGetBound(const MeshPartPayload::Pointer& payload) {
         if (payload) {
-            return payload->model->getPartBounds(payload->meshIndex, payload->partIndex);
+            return payload->getBound(); // model->getPartBounds(payload->meshIndex, payload->partIndex);
         }
         return render::Item::Bound();
     }
     const FBXMesh& mesh = geometry.meshes.at(meshIndex);
     const MeshState& state = _meshStates.at(meshIndex);
+    auto drawMesh = networkMesh._mesh;
     auto drawMaterialKey = material->getKey();
     bool translucentMesh = drawMaterialKey.isTransparent() || drawMaterialKey.isTransparentMap();
         return; // FIXME!
     }
-    batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0);
+    // Assign index buffer:
+    batch.setIndexBuffer(gpu::UINT32, (drawMesh->getIndexBuffer()._buffer), 0);
+ //   batch.setIndexBuffer(gpu::UINT32, (networkMesh._indexBuffer), 0);
     int vertexCount = mesh.vertices.size();
     if (vertexCount == 0) {
         // sanity check
     batch.setModelTransform(_transforms[0]);
     if (mesh.blendshapes.isEmpty()) {
-        batch.setInputFormat(networkMesh._vertexFormat);
+        batch.setInputFormat((drawMesh->getVertexFormat()));
-        batch.setInputStream(0, *networkMesh._vertexStream);
+        auto inputStream = drawMesh->makeBufferStream();
+        batch.setInputStream(0, inputStream);
+     //   batch.setInputFormat(networkMesh._vertexFormat);
+      //  batch.setInputStream(0, *networkMesh._vertexStream);
     } else {
+     /*   batch.setInputFormat((drawMesh->getVertexFormat()));
+        auto inputStream = drawMesh->makeBufferStream();
+        batch.setInputStream(0, inputStream);
+        */
         batch.setInputFormat(networkMesh._vertexFormat);
         batch.setInputBuffer(0, _blendedVertexBuffers[meshIndex], 0, sizeof(glm::vec3));
         batch.setInputBuffer(1, _blendedVertexBuffers[meshIndex], vertexCount * sizeof(glm::vec3), sizeof(glm::vec3));
         batch.setInputStream(2, *networkMesh._vertexStream);
         }
     }
-    batch.setIndexBuffer(gpu::UINT32, part.getMergedTriangles(), 0);
+    auto& drawPart = drawMesh->getPartBuffer().get<model::Mesh::Part>();
-    batch.drawIndexed(gpu::TRIANGLES, part.mergedTrianglesIndicesCount, 0);
+    batch.drawIndexed(model::Mesh::topologyToPrimitive(drawPart._topology), drawPart._numIndices, drawPart._startIndex);
+/*    batch.setIndexBuffer(gpu::UINT32, part.getMergedTriangles(), 0);
+    batch.drawIndexed(gpu::TRIANGLES, part.mergedTrianglesIndicesCount, 0);
+    */
     if (args) {
         const int INDICES_PER_TRIANGLE = 3;
         args->_details._trianglesRendered += part.mergedTrianglesIndicesCount / INDICES_PER_TRIANGLE;