Revert of Implementing Binary glTF reader for the VR controller model

chrome/browser/android/vr_shell/vr_controller_model.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/vr_controller_model.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/android/vr_shell/gltf_parser.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace vr_shell {
 
 namespace {
 
 enum {
-  ELEMENTS_BUFFER_ID = 2,
-  INDICES_BUFFER_ID = 3,
+  ELEMENTS_BUFFER_ID = 0,
+  INDICES_BUFFER_ID = 1,
 };
 
 constexpr char kPosition[] = "POSITION";
 constexpr char kTexCoord[] = "TEXCOORD_0";
 
 // TODO(acondor): Remove these hardcoded paths once VrShell resources
 // are delivered through component updater.
 constexpr char const kComponentName[] = "VrShell";
 constexpr char const kDefaultVersion[] = "0";
 
 constexpr char const kModelsDirectory[] = "models";
-constexpr char const kModelFilename[] = "ddcontroller.glb";
+constexpr char const kModelFilename[] = "controller.gltf";
 constexpr char const kTexturesDirectory[] = "tex";
 constexpr char const kBaseTextureFilename[] = "ddcontroller_idle.png";
 constexpr char const* kTexturePatchesFilenames[] = {
     "", "ddcontroller_touchpad.png", "ddcontroller_app.png",
     "ddcontroller_system.png",
 };
 const gfx::Point kPatchesLocations[] = {{}, {5, 5}, {47, 165}, {47, 234}};
 
 sk_sp<SkImage> LoadPng(const base::FilePath& path) {
   std::string data;
@@ skipping 113 matching lines @@
                     .Append(kDefaultVersion)
                     .Append(kModelsDirectory);
   auto model_path = models_path.Append(kModelFilename);
 
   // No further action if model file is not present
   if (!base::PathExists(model_path)) {
     LOG(WARNING) << "Controller model files not found";
     return nullptr;
   }
 
+  GltfParser gltf_parser;
   std::vector<std::unique_ptr<gltf::Buffer>> buffers;
-
-  std::string model_data;
-  base::ReadFileToString(model_path, &model_data);
-  auto asset = BinaryGltfParser::Parse(base::StringPiece(model_data), &buffers);
+  auto asset = gltf_parser.Parse(model_path, &buffers);
   if (!asset) {
     LOG(ERROR) << "Failed to read controller model";
     return nullptr;
   }
 
   auto controller_model =
       base::MakeUnique<VrControllerModel>(std::move(asset), std::move(buffers));
 
   auto textures_path = models_path.Append(kTexturesDirectory);
 
@@ skipping 13 matching lines @@
       LOG(ERROR) << "Failed to read controller texture patch";
       continue;
     }
     controller_model->SetTexturePatch(i, patch_image);
   }
 
   return controller_model;
 }
 
 }  // namespace vr_shell