1 files changed, 52 insertions, 27 deletions

diff --git a/indra/newview/gltf/primitive.cpp b/indra/newview/gltf/primitive.cpp
index b57a0af18d..1bde7327e6 100644
--- a/indra/newview/gltf/primitive.cpp
+++ b/indra/newview/gltf/primitive.cpp
@@ -28,10 +28,12 @@
 
 #include "asset.h"
 #include "buffer_util.h"
+#include "../llviewershadermgr.h"
 
 #include "../lltinygltfhelper.h"
 
 using namespace LL::GLTF;
+using namespace boost::json;
 
 void Primitive::allocateGLResources(Asset& asset)
 {
@@ -92,6 +94,10 @@ void Primitive::allocateGLResources(Asset& asset)
         mask |= LLVertexBuffer::MAP_WEIGHT4;
     }
 
+    if (LLGLSLShader::sCurBoundShaderPtr == nullptr)
+    { // make sure a shader is bound to satisfy mVertexBuffer->setBuffer
+        gDebugProgram.bind();
+    }
     mVertexBuffer = new LLVertexBuffer(mask);
     mVertexBuffer->allocateBuffer(mPositions.size(), mIndexArray.size()*2); // double the size of the index buffer for 32-bit indices
 
@@ -129,7 +135,7 @@ void Primitive::allocateGLResources(Asset& asset)
     if (mMaterial != INVALID_INDEX)
     {
         const Material& material = asset.mMaterials[mMaterial];
-        LLColor4 baseColor = material.mMaterial->mBaseColor;
+        LLColor4 baseColor(glm::value_ptr(material.mPbrMetallicRoughness.mBaseColorFactor));
         for (auto& dst : mColors)
         {
             dst = LLColor4U(baseColor * LLColor4(dst));
@@ -351,6 +357,50 @@ Primitive::~Primitive()
     mOctree = nullptr;
 }
 
+U32 gltf_mode_to_gl_mode(U32 mode)
+{
+    switch (mode)
+    {
+    case TINYGLTF_MODE_POINTS:
+        return LLRender::POINTS;
+    case TINYGLTF_MODE_LINE:
+        return LLRender::LINES;
+    case TINYGLTF_MODE_LINE_LOOP:
+        return LLRender::LINE_LOOP;
+    case TINYGLTF_MODE_LINE_STRIP:
+        return LLRender::LINE_STRIP;
+    case TINYGLTF_MODE_TRIANGLES:
+        return LLRender::TRIANGLES;
+    case TINYGLTF_MODE_TRIANGLE_STRIP:
+        return LLRender::TRIANGLE_STRIP;
+    case TINYGLTF_MODE_TRIANGLE_FAN:
+        return LLRender::TRIANGLE_FAN;
+    default:
+        return LLRender::TRIANGLES;
+    }
+}
+
+void Primitive::serialize(boost::json::object& dst) const
+{
+    write(mMaterial, "material", dst, -1);
+    write(mMode, "mode", dst, TINYGLTF_MODE_TRIANGLES);
+    write(mIndices, "indices", dst, INVALID_INDEX);
+    write(mAttributes, "attributes", dst);
+}
+
+const Primitive& Primitive::operator=(const Value& src)
+{
+    if (src.is_object())
+    {
+        copy(src, "material", mMaterial);
+        copy(src, "mode", mMode);
+        copy(src, "indices", mIndices);
+        copy(src, "attributes", mAttributes);
+
+        mGLMode = gltf_mode_to_gl_mode(mMode);
+    }
+    return *this;
+}
 
 const Primitive& Primitive::operator=(const tinygltf::Primitive& src)
 {
@@ -369,32 +419,7 @@ const Primitive& Primitive::operator=(const tinygltf::Primitive& src)
         mAttributes[it.first] = it.second;
     }
 
-    switch (mMode)
-    {
-    case TINYGLTF_MODE_POINTS:
-        mGLMode = LLRender::POINTS;
-        break;
-    case TINYGLTF_MODE_LINE:
-        mGLMode = LLRender::LINES;
-        break;
-    case TINYGLTF_MODE_LINE_LOOP:
-        mGLMode = LLRender::LINE_LOOP;
-        break;
-    case TINYGLTF_MODE_LINE_STRIP:
-        mGLMode = LLRender::LINE_STRIP;
-        break;
-    case TINYGLTF_MODE_TRIANGLES:
-        mGLMode = LLRender::TRIANGLES;
-        break;
-    case TINYGLTF_MODE_TRIANGLE_STRIP:
-        mGLMode = LLRender::TRIANGLE_STRIP;
-        break;
-    case TINYGLTF_MODE_TRIANGLE_FAN:
-        mGLMode = LLRender::TRIANGLE_FAN;
-        break;
-    default:
-        mGLMode = GL_TRIANGLES;
-    }
+    mGLMode = gltf_mode_to_gl_mode(mMode);
 
     return *this;
 }