From 429d82e6502b85bf99edb7d06931ac8ae6683440 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Tue, 6 Oct 2015 09:54:37 -0700
Subject: [PATCH] Fixing review comments

---
 libraries/fbx/src/FBXReader.h                        |  5 +----
 libraries/fbx/src/FBXReader_Mesh.cpp                 | 12 ++++++------
 .../src/model-networking/ModelCache.h                |  9 +--------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index a9c3326140..c0cbf5fb18 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -12,8 +12,6 @@
 #ifndef hifi_FBXReader_h
 #define hifi_FBXReader_h
 
-#define USE_MODEL_MESH 1
-
 #include <QMetaType>
 #include <QUrl>
 #include <QVarLengthArray>
@@ -188,9 +186,8 @@ public:
     QVector<FBXBlendshape> blendshapes;
 
     unsigned int meshIndex; // the order the meshes appeared in the object file
-#   if USE_MODEL_MESH
+
     model::MeshPointer _mesh;
-#   endif
 };
 
 class ExtractedMesh {
diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index c88eaf4137..097862ef38 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -495,8 +495,8 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) {
         return;
     }
 
-    auto ib = std::make_shared<gpu::Buffer>();
-    ib->resize(totalIndices * sizeof(int));
+    auto indexBuffer = std::make_shared<gpu::Buffer>();
+    indexBuffer->resize(totalIndices * sizeof(int));
 
     int indexNum = 0;
     int offset = 0;
@@ -509,7 +509,7 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) {
         model::Mesh::Part modelPart(indexNum, 0, 0, model::Mesh::TRIANGLES);
         
         if (part.quadTrianglesIndices.size()) {
-            ib->setSubData( offset,
+            indexBuffer->setSubData(offset,
                             part.quadTrianglesIndices.size() * sizeof(int),
                             (gpu::Byte*) part.quadTrianglesIndices.constData());
             offset += part.quadTrianglesIndices.size() * sizeof(int);
@@ -518,7 +518,7 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) {
         }
 
         if (part.triangleIndices.size()) {
-            ib->setSubData( offset,
+            indexBuffer->setSubData(offset,
                             part.triangleIndices.size() * sizeof(int),
                             (gpu::Byte*) part.triangleIndices.constData());
             offset += part.triangleIndices.size() * sizeof(int);
@@ -529,8 +529,8 @@ void FBXReader::buildModelMesh(ExtractedMesh& extracted, const QString& url) {
         parts.push_back(modelPart);
     }
 
-    gpu::BufferView ibv(ib, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::XYZ));
-    mesh->setIndexBuffer(ibv);
+    gpu::BufferView indexBufferView(indexBuffer, gpu::Element(gpu::SCALAR, gpu::UINT32, gpu::XYZ));
+    mesh->setIndexBuffer(indexBufferView);
 
     if (parts.size()) {
         auto pb = std::make_shared<gpu::Buffer>();
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index b53ea18874..cd75794e2b 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -192,13 +192,6 @@ public:
 class NetworkMesh {
 public:
     model::MeshPointer _mesh;
-
-/*    gpu::BufferPointer _indexBuffer;
-    gpu::BufferPointer _vertexBuffer;
-
-    gpu::BufferStreamPointer _vertexStream;
-
-    gpu::Stream::FormatPointer _vertexFormat;
-*/};
+};
 
 #endif // hifi_GeometryCache_h