From a1107deef19c713d84bf1a46c9234745bb6bf31f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 23 Jul 2017 08:21:50 -0700
Subject: [PATCH] cleanups
---
libraries/model/src/model/Geometry.cpp | 3 ---
libraries/render-utils/src/Model.cpp | 4 +++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libraries/model/src/model/Geometry.cpp b/libraries/model/src/model/Geometry.cpp
index 5a8f4de0ca..5627746c43 100755
--- a/libraries/model/src/model/Geometry.cpp
+++ b/libraries/model/src/model/Geometry.cpp
@@ -152,8 +152,6 @@ model::MeshPointer Mesh::map(std::function<glm::vec3(glm::vec3)> vertexFunc,
}
// color data
- // static const gpu::Element COLOR_ELEMENT { gpu::VEC4, gpu::NUINT8, gpu::RGBA };
- // int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
int attributeTypeColor = gpu::Stream::COLOR;
const gpu::BufferView& colorsBufferView = getAttributeBuffer(attributeTypeColor);
gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
@@ -250,7 +248,6 @@ void Mesh::forEach(std::function<void(glm::vec3)> vertexFunc,
// color data
int attributeTypeColor = gpu::Stream::InputSlot::COLOR; // libraries/gpu/src/gpu/Stream.h
- // int attributeTypeColor = gpu::Stream::COLOR;
const gpu::BufferView& colorsBufferView = getAttributeBuffer(attributeTypeColor);
gpu::BufferView::Index numColors = (gpu::BufferView::Index)colorsBufferView.getNumElements();
for (gpu::BufferView::Index i = 0; i < numColors; i++) {
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 917d284f86..095712f351 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -488,7 +488,9 @@ MeshProxyList Model::getMeshes() {
return glm::vec3(offsetMat * glm::vec4(position, 1.0f));
},
[=](glm::vec3 color) { return color; },
- [=](glm::vec3 normal) { return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f))); },
+ [=](glm::vec3 normal) {
+ return glm::normalize(glm::vec3(offsetMat * glm::vec4(normal, 0.0f)));
+ },
[&](uint32_t index) { return index; }));
result << meshProxy;
}