Replace Util::getAttributeStringData()

sideeffects · Aug 5, 2016 · 312db17 · 312db17
1 parent 500a3bc
commit 312db17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 58 deletions.
diff --git a/OutputInstancerObject.C b/OutputInstancerObject.C
@@ -8,6 +8,7 @@
 #include "Asset.h"
 #include "AssetNode.h"
 #include "OutputInstancerObject.h"
+#include "hapiutil.h"
 #include "util.h"
 
 OutputInstancerObject::OutputInstancerObject(
@@ -31,12 +32,6 @@ OutputInstancerObject::type()
     return OutputObject::OBJECT_TYPE_INSTANCER;
 }
 
-MStringArray
-OutputInstancerObject::getAttributeStringData(HAPI_AttributeOwner owner, MString name)
-{
-    return Util::getAttributeStringData(myAssetId, myObjectId, 0, 0, owner, name);
-}
-
 void
 OutputInstancerObject::update()
 {
@@ -90,7 +85,9 @@ OutputInstancerObject::update()
         }
 
         // fill array of size pointCount of instanced names
-        MStringArray instanceAttrs = getAttributeStringData(HAPI_ATTROWNER_POINT, "instance");
+        HAPI_AttributeInfo attrInfo;
+        MStringArray instanceAttrs;
+        hapiGetPointAttribute(myAssetId, myObjectId, 0, 0, "instance", attrInfo, instanceAttrs);
         for(unsigned int i=0; i<instanceAttrs.length(); i++)
         {
             MStringArray splitObjName;
@@ -99,7 +96,8 @@ OutputInstancerObject::update()
             myHoudiniInstanceAttribute.append(instanceAttrs[i]);
         }
 
-        MStringArray nameAttrs = getAttributeStringData(HAPI_ATTROWNER_POINT, "name");
+        MStringArray nameAttrs;
+        hapiGetPointAttribute(myAssetId, myObjectId, 0, 0, "name", attrInfo, nameAttrs);
         for(unsigned int ii = 0; ii < nameAttrs.length(); ii++)
         {
             myHoudiniNameAttribute.append(nameAttrs[ii]);

diff --git a/util.C b/util.C
@@ -752,52 +752,6 @@ sanitizeStringForNodeName(const MString &str)
     return result;
 }
 
-MStringArray
-getAttributeStringData(int assetId,
-                            int objectId,
-                            int geoId,
-                            int partId,
-                            HAPI_AttributeOwner owner,
-                            const MString & name)
-{
-    HAPI_AttributeInfo attr_info;
-    attr_info.exists = false;
-    HAPI_GetAttributeInfo(
-            theHAPISession.get(),
-            assetId, objectId, geoId, partId,
-            name.asChar(),
-            owner,
-            &attr_info
-            );
-
-    MStringArray ret;
-    if(!attr_info.exists)
-        return ret;
-
-    int size = attr_info.count * attr_info.tupleSize;
-    int * data = new int[size];
-    // zero the array
-    for(int j=0; j<size; j++){
-        data[j] = 0;
-    }
-    HAPI_GetAttributeStringData(
-            theHAPISession.get(),
-            assetId, objectId, geoId, partId,
-            name.asChar(),
-            &attr_info,
-            data,
-            0, attr_info.count
-            );
-
-    for(int j=0; j<size; j++){
-        ret.append(HAPIString(data[j]));
-    }
-
-    delete[] data;
-
-    return ret;
-}
-
 int
 findParm(std::vector<HAPI_ParmInfo>& parms, MString name, int instanceNum)
 {

diff --git a/util.h b/util.h
@@ -219,10 +219,6 @@ MString getAttrNameFromParm(
         const HAPI_ParmInfo &parm,
         const HAPI_ParmInfo *parentParm
         );
-MStringArray getAttributeStringData(int assetId, int objectId,
-        int geoId, int partId,
-        HAPI_AttributeOwner owner,
-        const MString & name);
 MString getParmAttrPrefix();
 bool hasHAPICallFailed(HAPI_Result stat);