From 263dcbb535d3248ea2c17c2d2087270065f9d24b Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Fri, 15 Apr 2016 11:12:34 -0700
Subject: [PATCH] Consolidate BufferView ctors to cpp

---
 libraries/gpu/src/gpu/Resource.cpp | 23 +++++++++
 libraries/gpu/src/gpu/Resource.h   | 75 +++++++-----------------------
 2 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/libraries/gpu/src/gpu/Resource.cpp b/libraries/gpu/src/gpu/Resource.cpp
index c793a92b72..deb17300c3 100644
--- a/libraries/gpu/src/gpu/Resource.cpp
+++ b/libraries/gpu/src/gpu/Resource.cpp
@@ -325,3 +325,26 @@ Buffer::Size Buffer::append(Size size, const Byte* data) {
     return newSize;
 }
 
+const Element BufferView::DEFAULT_ELEMENT = Element( gpu::SCALAR, gpu::UINT8, gpu::RAW );
+
+BufferView::BufferView() :
+BufferView(DEFAULT_ELEMENT) {}
+
+BufferView::BufferView(const Element& element) :
+    BufferView(BufferPointer(), element) {}
+
+BufferView::BufferView(Buffer* newBuffer, const Element& element) :
+    BufferView(BufferPointer(newBuffer), element) {}
+
+BufferView::BufferView(const BufferPointer& buffer, const Element& element) :
+    BufferView(buffer, DEFAULT_OFFSET, buffer ? buffer->getSize() : 0, element.getSize(), element) {}
+
+BufferView::BufferView(const BufferPointer& buffer, Size offset, Size size, const Element& element) :
+    BufferView(buffer, offset, size, element.getSize(), element) {}
+
+BufferView::BufferView(const BufferPointer& buffer, Size offset, Size size, uint16 stride, const Element& element) :
+    _buffer(buffer),
+    _offset(offset),
+    _size(size),
+    _element(element),
+    _stride(stride) {}
diff --git a/libraries/gpu/src/gpu/Resource.h b/libraries/gpu/src/gpu/Resource.h
index 98ad0a2d28..570aff00fc 100644
--- a/libraries/gpu/src/gpu/Resource.h
+++ b/libraries/gpu/src/gpu/Resource.h
@@ -174,73 +174,30 @@ typedef std::vector< BufferPointer > Buffers;
 
 
 class BufferView {
-protected: 
-    void initFromBuffer(const BufferPointer& buffer) {
-        _buffer = (buffer);
-        if (_buffer) {
-            _size = (buffer->getSize());
-        }
-    }
+protected:
+    static const Resource::Size DEFAULT_OFFSET{ 0 };
+    static const Element DEFAULT_ELEMENT;
+
 public:
-    typedef Resource::Size Size;
-    typedef int Index;
+    using Size = Resource::Size;
+    using Index = int;
 
     BufferPointer _buffer;
-    Size _offset{ 0 };
-    Size _size{ 0 };
+    Size _offset;
+    Size _size;
     Element _element;
-    uint16 _stride{ 1 };
+    uint16 _stride;
 
-    BufferView() :
-        _buffer(NULL),
-        _offset(0),
-        _size(0),
-        _element(gpu::SCALAR, gpu::UINT8, gpu::RAW),
-        _stride(1)
-    {};
-
-    BufferView(const Element& element) :
-        _buffer(NULL),
-        _offset(0),
-        _size(0),
-        _element(element),
-        _stride(uint16(element.getSize()))
-    {};
-
-    // create the BufferView and own the Buffer
-    BufferView(Buffer* newBuffer, const Element& element = Element(gpu::SCALAR, gpu::UINT8, gpu::RAW)) :
-        _offset(0),
-        _element(element),
-        _stride(uint16(element.getSize()))
-    {
-        initFromBuffer(BufferPointer(newBuffer));
-    };
-    BufferView(const BufferPointer& buffer, const Element& element = Element(gpu::SCALAR, gpu::UINT8, gpu::RAW)) :
-        _offset(0),
-        _element(element),
-        _stride(uint16(element.getSize()))
-    {
-        initFromBuffer(buffer);
-    };
-    BufferView(const BufferPointer& buffer, Size offset, Size size, const Element& element = Element(gpu::SCALAR, gpu::UINT8, gpu::RAW)) :
-        _buffer(buffer),
-        _offset(offset),
-        _size(size),
-        _element(element),
-        _stride(uint16(element.getSize()))
-    {};
-    BufferView(const BufferPointer& buffer, Size offset, Size size, uint16 stride, const Element& element = Element(gpu::SCALAR, gpu::UINT8, gpu::RAW)) :
-        _buffer(buffer),
-        _offset(offset),
-        _size(size),
-        _element(element),
-        _stride(stride)
-    {};
-
-    ~BufferView() {}
     BufferView(const BufferView& view) = default;
     BufferView& operator=(const BufferView& view) = default;
 
+    BufferView();
+    BufferView(const Element& element);
+    BufferView(Buffer* newBuffer, const Element& element = DEFAULT_ELEMENT);
+    BufferView(const BufferPointer& buffer, const Element& element = DEFAULT_ELEMENT);
+    BufferView(const BufferPointer& buffer, Size offset, Size size, const Element& element = DEFAULT_ELEMENT);
+    BufferView(const BufferPointer& buffer, Size offset, Size size, uint16 stride, const Element& element = DEFAULT_ELEMENT);
+
     Size getNumElements() const { return _size / _element.getSize(); }
 
     //Template iterator with random access on the buffer sysmem