1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate (#1258)

* #1176 Somewhat working GLTF Node support for translate tool

* #1176 Missing file from last commit

* #1176 Better translation for rotated nodes.

* #1176 Fix for objects snapping back to original position

* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display

* #1176 Clean out some unused and not working functions.

* #1176 Fix for mac build, incidental cleanup

* Mac build fix

1 files changed, 114 insertions, 39 deletions

diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index 6c44b83646..8273c707f9 100644
--- a/indra/newview/gltfscenemanager.cpp
+++ b/indra/newview/gltfscenemanager.cpp
@@ -91,7 +91,11 @@ void GLTFSceneManager::load(const std::string& filename)
     if (obj)
     { // assign to self avatar
         obj->mGLTFAsset = asset;
-        mObjects.push_back(obj);
+
+        if (std::find(mObjects.begin(), mObjects.end(), obj) == mObjects.end())
+        {
+            mObjects.push_back(obj);
+        }
     }
 }
 
@@ -100,43 +104,17 @@ GLTFSceneManager::~GLTFSceneManager()
     mObjects.clear();
 }
 
-LLMatrix4a getAssetToAgentTransform(LLViewerObject* obj)
+void GLTFSceneManager::renderOpaque()
 {
-    LLMatrix4 root;
-    root.initScale(obj->getScale());
-    root.rotate(obj->getRenderRotation());
-    root.translate(obj->getPositionAgent());
-
-    LLMatrix4a mat;
-    mat.loadu((F32*) root.mMatrix);
-
-    return mat;
+    render(true);
 }
 
-LLMatrix4a getAgentToAssetTransform(LLViewerObject* obj)
+void GLTFSceneManager::renderAlpha()
 {
-    LLMatrix4 root;
-    LLVector3 scale = obj->getScale();
-    scale.mV[0] = 1.f / scale.mV[0];
-    scale.mV[1] = 1.f / scale.mV[1];
-    scale.mV[2] = 1.f / scale.mV[2];
-        
-    root.translate(-obj->getPositionAgent());
-    root.rotate(~obj->getRenderRotation());
-
-    LLMatrix4 scale_mat;
-    scale_mat.initScale(scale);
-
-    root *= scale_mat;
-    
-
-    LLMatrix4a mat;
-    mat.loadu((F32*) root.mMatrix);
-
-    return mat;
+    render(false);
 }
 
-void GLTFSceneManager::renderOpaque()
+void GLTFSceneManager::render(bool opaque)
 {
     // for debugging, just render the whole scene as opaque
     // by traversing the whole scenegraph
@@ -158,7 +136,7 @@ void GLTFSceneManager::renderOpaque()
 
         gGL.pushMatrix();
 
-        LLMatrix4a mat = getAssetToAgentTransform(mObjects[i]);
+        LLMatrix4a mat = mObjects[i]->getGLTFAssetToAgentTransform();
 
         LLMatrix4a modelview;
         modelview.loadu(gGLModelView);
@@ -166,7 +144,7 @@ void GLTFSceneManager::renderOpaque()
         matMul(mat, modelview, modelview);
 
         asset->updateRenderTransforms(modelview);
-        asset->renderOpaque();
+        asset->render(opaque);
 
         gGL.popMatrix();
     }
@@ -195,7 +173,7 @@ bool GLTFSceneManager::lineSegmentIntersect(LLVOVolume* obj, Asset* asset, const
     LLVector4a local_start;
     LLVector4a local_end;
 
-    LLMatrix4a asset_to_agent = getAssetToAgentTransform(obj);
+    LLMatrix4a asset_to_agent = obj->getGLTFAssetToAgentTransform();
     LLMatrix4a agent_to_asset = inverse(asset_to_agent);
 
     agent_to_asset.affineTransform(start, local_start);
@@ -331,7 +309,7 @@ void renderAssetDebug(LLViewerObject* obj, Asset* asset)
     gGL.pushMatrix();
 
     // get raycast in asset space
-    LLMatrix4a agent_to_asset = getAgentToAssetTransform(obj);
+    LLMatrix4a agent_to_asset = obj->getAgentToGLTFAssetTransform();
 
     LLVector4a start;
     LLVector4a end;
@@ -399,7 +377,8 @@ void GLTFSceneManager::renderDebug()
 {
     if (!gPipeline.hasRenderDebugMask(
         LLPipeline::RENDER_DEBUG_BBOXES |
-        LLPipeline::RENDER_DEBUG_RAYCAST))
+        LLPipeline::RENDER_DEBUG_RAYCAST |
+        LLPipeline::RENDER_DEBUG_NODES))
     {
         return;
     }
@@ -412,6 +391,7 @@ void GLTFSceneManager::renderDebug()
     gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
     gPipeline.disableLights();
 
+    // force update all mRenderMatrix, not just nodes with meshes
     for (auto& obj : mObjects)
     {
         if (obj->isDead() || obj->mGLTFAsset == nullptr)
@@ -419,20 +399,115 @@ void GLTFSceneManager::renderDebug()
             continue;
         }
 
+        LLMatrix4a mat = obj->getGLTFAssetToAgentTransform();
+
+        LLMatrix4a modelview;
+        modelview.loadu(gGLModelView);
+
+        matMul(mat, modelview, modelview);
+
         Asset* asset = obj->mGLTFAsset;
 
+        for (auto& node : asset->mNodes)
+        {
+            matMul(node.mAssetMatrix, modelview, node.mRenderMatrix);
+        }
+    }
 
-        LLMatrix4a mat = getAssetToAgentTransform(obj);
+    for (auto& obj : mObjects)
+    {
+        if (obj->isDead() || obj->mGLTFAsset == nullptr)
+        {
+            continue;
+        }
+
+        Asset* asset = obj->mGLTFAsset;
+
+        LLMatrix4a mat = obj->getGLTFAssetToAgentTransform();
 
         LLMatrix4a modelview;
         modelview.loadu(gGLModelView);
 
         matMul(mat, modelview, modelview);
 
-        asset->updateRenderTransforms(modelview);
         renderAssetDebug(obj, asset);
     }
 
+    if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_NODES))
+    { //render node hierarchy
+
+        for (U32 i = 0; i < 2; ++i)
+        {
+            LLGLDepthTest depth(GL_TRUE, i == 0 ? GL_FALSE : GL_TRUE, i == 0 ? GL_GREATER : GL_LEQUAL);
+            LLGLState blend(GL_BLEND, i == 0 ? TRUE : FALSE);
+
+
+            gGL.pushMatrix();
+
+            for (auto& obj : mObjects)
+            {
+                if (obj->isDead() || obj->mGLTFAsset == nullptr)
+                {
+                    continue;
+                }
+
+                LLMatrix4a mat = obj->getGLTFAssetToAgentTransform();
+
+                LLMatrix4a modelview;
+                modelview.loadu(gGLModelView);
+
+                matMul(mat, modelview, modelview);
+
+                Asset* asset = obj->mGLTFAsset;
+
+                for (auto& node : asset->mNodes)
+                {
+                    // force update all mRenderMatrix, not just nodes with meshes
+                    matMul(node.mAssetMatrix, modelview, node.mRenderMatrix);
+
+                    gGL.loadMatrix(node.mRenderMatrix.getF32ptr());
+                    // render x-axis red, y-axis green, z-axis blue
+                    gGL.color4f(1.f, 0.f, 0.f, 0.5f);
+                    gGL.begin(LLRender::LINES);
+                    gGL.vertex3f(0.f, 0.f, 0.f);
+                    gGL.vertex3f(1.f, 0.f, 0.f);
+                    gGL.end();
+                    gGL.flush();
+
+                    gGL.color4f(0.f, 1.f, 0.f, 0.5f);
+                    gGL.begin(LLRender::LINES);
+                    gGL.vertex3f(0.f, 0.f, 0.f);
+                    gGL.vertex3f(0.f, 1.f, 0.f);
+                    gGL.end();
+                    gGL.flush();
+
+                    gGL.begin(LLRender::LINES);
+                    gGL.color4f(0.f, 0.f, 1.f, 0.5f);
+                    gGL.vertex3f(0.f, 0.f, 0.f);
+                    gGL.vertex3f(0.f, 0.f, 1.f);
+                    gGL.end();
+                    gGL.flush();
+
+                    // render path to child nodes cyan
+                    gGL.color4f(0.f, 1.f, 1.f, 0.5f);
+                    gGL.begin(LLRender::LINES);
+                    for (auto& child_idx : node.mChildren)
+                    {
+                        Node& child = asset->mNodes[child_idx];
+                        gGL.vertex3f(0.f, 0.f, 0.f);
+                        gGL.vertex3fv(child.mMatrix.getTranslation().getF32ptr());
+                    }
+                    gGL.end();
+                    gGL.flush();
+                }
+            }
+
+            gGL.popMatrix();
+        }
+
+    }
+
+
     if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
     {
         S32 node_hit = -1;