Merge pull request #4307 from secondlife/revert-4306-geenz/develop-to-gltf-mesh

Revert "Merge develop into glTF mesh import"

Author: Geenz

.github/workflows/build.yaml

@@ -218,10 +218,8 @@ jobs:
               prefix=${ba[0]}
               if [ "$prefix" == "project" ]; then
                   IFS='_' read -ra prj <<< "${ba[1]}"
-                  prj_str="${prj[*]}"
                   # uppercase first letter of each word
-                  capitalized=$(echo "$prj_str" | awk '{for (i=1; i<=NF; i++) $i = toupper(substr($i,1,1)) substr($i,2); print}')
-                  export viewer_channel="Second Life Project $capitalized"
+                  export viewer_channel="Second Life Project ${prj[*]^}"
               elif  [[ "$prefix" == "release" || "$prefix" == "main" ]];
               then
                   export viewer_channel="Second Life Release"
@@ -457,6 +455,7 @@ jobs:
           prerelease: true
           generate_release_notes: true
           target_commitish: ${{ github.sha }}
+          previous_tag: release
           append_body: true
           fail_on_unmatched_files: true
           files: |

indra/llappearance/CMakeLists.txt

@@ -14,7 +14,6 @@ set(llappearance_SOURCE_FILES
     llavatarjoint.cpp
     llavatarjointmesh.cpp
     lldriverparam.cpp
-    lljointdata.h
     lllocaltextureobject.cpp
     llpolyskeletaldistortion.cpp
     llpolymesh.cpp

indra/llappearance/llavatarappearance.cpp

@@ -29,17 +29,16 @@
 #include "llavatarappearance.h"
 #include "llavatarappearancedefines.h"
 #include "llavatarjointmesh.h"
-#include "lljointdata.h"
 #include "llstl.h"
 #include "lldir.h"
 #include "llpolymorph.h"
 #include "llpolymesh.h"
 #include "llpolyskeletaldistortion.h"
+#include "llstl.h"
 #include "lltexglobalcolor.h"
 #include "llwearabledata.h"
 #include "boost/bind.hpp"
 #include "boost/tokenizer.hpp"
-#include "v4math.h"
 
 using namespace LLAvatarAppearanceDefines;
 
@@ -72,13 +71,11 @@ class LLAvatarBoneInfo
         mChildren.clear();
     }
     bool parseXml(LLXmlTreeNode* node);
-    glm::mat4 getJointMatrix();
 
 private:
     std::string mName;
     std::string mSupport;
     std::string mAliases;
-    std::string mGroup;
     bool mIsJoint;
     LLVector3 mPos;
     LLVector3 mEnd;
@@ -108,17 +105,11 @@ class LLAvatarSkeletonInfo
     S32 getNumBones() const { return mNumBones; }
     S32 getNumCollisionVolumes() const { return mNumCollisionVolumes; }
 
-private:
-    typedef std::vector<LLAvatarBoneInfo*> bone_info_list_t;
-    static void getJointMatricesAndHierarhy(
-        LLAvatarBoneInfo* bone_info,
-        LLJointData& data,
-        const glm::mat4& parent_mat);
-
 private:
     S32 mNumBones;
     S32 mNumCollisionVolumes;
     LLAvatarAppearance::joint_alias_map_t mJointAliasMap;
+    typedef std::vector<LLAvatarBoneInfo*> bone_info_list_t;
     bone_info_list_t mBoneInfoList;
 };
 
@@ -1607,15 +1598,6 @@ bool LLAvatarBoneInfo::parseXml(LLXmlTreeNode* node)
         mSupport = "base";
     }
 
-    // Skeleton has 133 bones, but shader only allows 110 (LL_MAX_JOINTS_PER_MESH_OBJECT)
-    // Groups can be used by importer to cut out unused groups of joints
-    static LLStdStringHandle group_string = LLXmlTree::addAttributeString("group");
-    if (!node->getFastAttributeString(group_string, mGroup))
-    {
-        LL_WARNS() << "Bone without group " << mName << LL_ENDL;
-        mGroup = "global";
-    }
-
     if (mIsJoint)
     {
         static LLStdStringHandle pivot_string = LLXmlTree::addAttributeString("pivot");
@@ -1641,21 +1623,6 @@ bool LLAvatarBoneInfo::parseXml(LLXmlTreeNode* node)
     return true;
 }
 
-
-glm::mat4 LLAvatarBoneInfo::getJointMatrix()
-{
-    glm::mat4 mat(1.0f);
-    // 1. Scaling
-    mat = glm::scale(mat, glm::vec3(mScale[0], mScale[1], mScale[2]));
-    // 2. Rotation (Euler angles rad)
-    mat = glm::rotate(mat, mRot[0], glm::vec3(1, 0, 0));
-    mat = glm::rotate(mat, mRot[1], glm::vec3(0, 1, 0));
-    mat = glm::rotate(mat, mRot[2], glm::vec3(0, 0, 1));
-    // 3. Position
-    mat = glm::translate(mat, glm::vec3(mPos[0], mPos[1], mPos[2]));
-    return mat;
-}
-
 //-----------------------------------------------------------------------------
 // LLAvatarSkeletonInfo::parseXml()
 //-----------------------------------------------------------------------------
@@ -1686,25 +1653,6 @@ bool LLAvatarSkeletonInfo::parseXml(LLXmlTreeNode* node)
     return true;
 }
 
-void LLAvatarSkeletonInfo::getJointMatricesAndHierarhy(
-    LLAvatarBoneInfo* bone_info,
-    LLJointData& data,
-    const glm::mat4& parent_mat)
-{
-    data.mName = bone_info->mName;
-    data.mJointMatrix = bone_info->getJointMatrix();
-    data.mScale = glm::vec3(bone_info->mScale[0], bone_info->mScale[1], bone_info->mScale[2]);
-    data.mRotation = bone_info->mRot;
-    data.mRestMatrix = parent_mat * data.mJointMatrix;
-    data.mIsJoint = bone_info->mIsJoint;
-    data.mGroup = bone_info->mGroup;
-    for (LLAvatarBoneInfo* child_info : bone_info->mChildren)
-    {
-        LLJointData& child_data = data.mChildren.emplace_back();
-        getJointMatricesAndHierarhy(child_info, child_data, data.mRestMatrix);
-    }
-}
-
 //Make aliases for joint and push to map.
 void LLAvatarAppearance::makeJointAliases(LLAvatarBoneInfo *bone_info)
 {
@@ -1766,16 +1714,6 @@ const LLAvatarAppearance::joint_alias_map_t& LLAvatarAppearance::getJointAliases
     return mJointAliasMap;
 }
 
-void LLAvatarAppearance::getJointMatricesAndHierarhy(std::vector<LLJointData> &data) const
-{
-    glm::mat4 identity(1.f);
-    for (LLAvatarBoneInfo* bone_info : sAvatarSkeletonInfo->mBoneInfoList)
-    {
-        LLJointData& child_data = data.emplace_back();
-        LLAvatarSkeletonInfo::getJointMatricesAndHierarhy(bone_info, child_data, identity);
-    }
-}
-
 
 //-----------------------------------------------------------------------------
 // parseXmlSkeletonNode(): parses <skeleton> nodes from XML tree

indra/llappearance/llavatarappearance.h

@@ -34,15 +34,13 @@
 #include "lltexlayer.h"
 #include "llviewervisualparam.h"
 #include "llxmltree.h"
-#include "v4math.h"
 
 class LLTexLayerSet;
 class LLTexGlobalColor;
 class LLTexGlobalColorInfo;
 class LLWearableData;
 class LLAvatarBoneInfo;
 class LLAvatarSkeletonInfo;
-class LLJointData;
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // LLAvatarAppearance
@@ -140,7 +138,7 @@ class LLAvatarAppearance : public LLCharacter
     LLVector3           mHeadOffset{}; // current head position
     LLAvatarJoint*      mRoot{ nullptr };
 
-    typedef std::map<std::string, LLJoint*> joint_map_t;
+    typedef std::map<std::string, LLJoint*, std::less<>> joint_map_t;
     joint_map_t         mJointMap;
 
     typedef std::map<std::string, LLVector3> joint_state_map_t;
@@ -153,11 +151,9 @@ class LLAvatarAppearance : public LLCharacter
 public:
     typedef std::vector<LLAvatarJoint*> avatar_joint_list_t;
     const avatar_joint_list_t& getSkeleton() { return mSkeleton; }
-    typedef std::map<std::string, std::string> joint_alias_map_t;
+    typedef std::map<std::string, std::string, std::less<>> joint_alias_map_t;
     const joint_alias_map_t& getJointAliases();
-    typedef std::map<std::string, std::string> joint_parent_map_t; // matrix plus parent
-    typedef std::map<std::string, glm::mat4> joint_rest_map_t;
-    void getJointMatricesAndHierarhy(std::vector<LLJointData> &data) const;
+
 
 protected:
     static bool         parseSkeletonFile(const std::string& filename, LLXmlTree& skeleton_xml_tree);

indra/llappearance/lljointdata.h

@@ -131,7 +131,7 @@ LLQuaternion::Order bvhStringToOrder( char *str )
 // LLBVHLoader()
 //-----------------------------------------------------------------------------
 
-LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string>& joint_alias_map )
+LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string, std::less<>>& joint_alias_map )
 {
     reset();
     errorLine = 0;
@@ -156,9 +156,9 @@ LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &error
     }
 
     // Recognize all names we've been told are legal.
-    for (std::map<std::string, std::string>::value_type& alias_pair : joint_alias_map)
+    for (const auto& [alias, joint] : joint_alias_map)
     {
-        makeTranslation( alias_pair.first , alias_pair.second );
+        makeTranslation(alias, joint);
     }
 
     char error_text[128];       /* Flawfinder: ignore */

indra/llcharacter/llbvhloader.cpp

@@ -227,7 +227,7 @@ class LLBVHLoader
     friend class LLKeyframeMotion;
 public:
     // Constructor
-    LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string>& joint_alias_map );
+    LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine, std::map<std::string, std::string, std::less<>>& joint_alias_map );
     ~LLBVHLoader();
 
 /*

indra/llcharacter/llbvhloader.h

@@ -77,12 +77,11 @@ LLCharacter::~LLCharacter()
 //-----------------------------------------------------------------------------
 // getJoint()
 //-----------------------------------------------------------------------------
-LLJoint *LLCharacter::getJoint( const std::string &name )
+LLJoint* LLCharacter::getJoint(std::string_view name)
 {
-    LLJoint* joint = NULL;
+    LLJoint* joint = nullptr;
 
-    LLJoint *root = getRootJoint();
-    if (root)
+    if (LLJoint* root = getRootJoint())
     {
         joint = root->findJoint(name);
     }

indra/llcharacter/llcharacter.cpp

@@ -76,7 +76,7 @@ class LLCharacter
     // get the specified joint
     // default implementation does recursive search,
     // subclasses may optimize/cache results.
-    virtual LLJoint *getJoint( const std::string &name );
+    virtual LLJoint* getJoint(std::string_view name);
 
     // get the position of the character
     virtual LLVector3 getCharacterPosition() = 0;

indra/llcharacter/llcharacter.h

@@ -12,6 +12,7 @@ include(TinyGLTF)
 
 set(llprimitive_SOURCE_FILES
     lldaeloader.cpp
+    llgltfloader.cpp
     llgltfmaterial.cpp
     llmaterialid.cpp
     llmaterial.cpp
@@ -31,6 +32,7 @@ set(llprimitive_SOURCE_FILES
 set(llprimitive_HEADER_FILES
     CMakeLists.txt
     lldaeloader.h
+    llgltfloader.h
     llgltfmaterial.h
     llgltfmaterial_templates.h
     legacy_object_types.h