Skip to content

Commit 86b140b

Browse files
andrewkwwandrewkww
committed
Rename houdiniInputLocator to houdiniInputTransform
The input node ultimately operates on the transforms, so it is not specific to locators.
1 parent df1a5f0 commit 86b140b

6 files changed

+47
-47
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set(
2222
InputMesh.C
2323
InputCurve.C
2424
InputParticle.C
25-
InputLocatorNode.C
25+
InputTransformNode.C
2626
InputMergeNode.C
2727
OutputObject.C
2828
util.C

‎InputLocatorNode.C ‎InputTransformNode.C

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "InputLocatorNode.h"
1+
#include "InputTransformNode.h"
22

33
#include <maya/MFnMatrixAttribute.h>
44
#include <maya/MFnNumericAttribute.h>
@@ -9,55 +9,55 @@
99
#include "hapiutil.h"
1010
#include "util.h"
1111

12-
MString InputLocatorNode::typeName("houdiniInputLocator");
13-
MTypeId InputLocatorNode::typeId(MayaTypeID_HoudiniInputLocatorNode);
12+
MString InputTransformNode::typeName("houdiniInputTransform");
13+
MTypeId InputTransformNode::typeId(MayaTypeID_HoudiniInputTransformNode);
1414

15-
MObject InputLocatorNode::inputTransform;
16-
MObject InputLocatorNode::inputMatrix;
17-
MObject InputLocatorNode::outputNodeId;
15+
MObject InputTransformNode::inputTransform;
16+
MObject InputTransformNode::inputMatrix;
17+
MObject InputTransformNode::outputNodeId;
1818

1919
void*
20-
InputLocatorNode::creator()
20+
InputTransformNode::creator()
2121
{
22-
return new InputLocatorNode();
22+
return new InputTransformNode();
2323
}
2424

2525
MStatus
26-
InputLocatorNode::initialize()
26+
InputTransformNode::initialize()
2727
{
2828
MFnMatrixAttribute mAttr;
2929
MFnNumericAttribute nAttr;
3030

31-
InputLocatorNode::inputTransform = mAttr.create(
31+
InputTransformNode::inputTransform = mAttr.create(
3232
"inputTransform", "inputTransform"
3333
);
34-
addAttribute(InputLocatorNode::inputTransform);
34+
addAttribute(InputTransformNode::inputTransform);
3535

36-
InputLocatorNode::inputMatrix = mAttr.create(
36+
InputTransformNode::inputMatrix = mAttr.create(
3737
"inputMatrix", "inputMatrix"
3838
);
3939
mAttr.setArray(true);
4040
mAttr.setCached(false);
4141
mAttr.setStorable(false);
4242
mAttr.setDisconnectBehavior(MFnAttribute::kDelete);
43-
addAttribute(InputLocatorNode::inputMatrix);
43+
addAttribute(InputTransformNode::inputMatrix);
4444

45-
InputLocatorNode::outputNodeId = nAttr.create(
45+
InputTransformNode::outputNodeId = nAttr.create(
4646
"outputNodeId", "outputNodeId",
4747
MFnNumericData::kInt,
4848
-1
4949
);
5050
nAttr.setCached(false);
5151
nAttr.setStorable(false);
52-
addAttribute(InputLocatorNode::outputNodeId);
52+
addAttribute(InputTransformNode::outputNodeId);
5353

54-
attributeAffects(InputLocatorNode::inputTransform, InputLocatorNode::outputNodeId);
55-
attributeAffects(InputLocatorNode::inputMatrix, InputLocatorNode::outputNodeId);
54+
attributeAffects(InputTransformNode::inputTransform, InputTransformNode::outputNodeId);
55+
attributeAffects(InputTransformNode::inputMatrix, InputTransformNode::outputNodeId);
5656

5757
return MStatus::kSuccess;
5858
}
5959

60-
InputLocatorNode::InputLocatorNode() :
60+
InputTransformNode::InputTransformNode() :
6161
myGeometryNodeId(-1)
6262
{
6363
Util::PythonInterpreterLock pythonInterpreterLock;
@@ -73,7 +73,7 @@ InputLocatorNode::InputLocatorNode() :
7373
}
7474
}
7575

76-
InputLocatorNode::~InputLocatorNode()
76+
InputTransformNode::~InputTransformNode()
7777
{
7878
CHECK_HAPI(HAPI_DeleteNode(
7979
Util::theHAPISession.get(),
@@ -82,14 +82,14 @@ InputLocatorNode::~InputLocatorNode()
8282
}
8383

8484
MStatus
85-
InputLocatorNode::compute(
85+
InputTransformNode::compute(
8686
const MPlug &plug,
8787
MDataBlock &dataBlock
8888
)
8989
{
90-
if(plug == InputLocatorNode::outputNodeId)
90+
if(plug == InputTransformNode::outputNodeId)
9191
{
92-
MPlug inputMatrixArrayPlug(thisMObject(), InputLocatorNode::inputMatrix);
92+
MPlug inputMatrixArrayPlug(thisMObject(), InputTransformNode::inputMatrix);
9393

9494
const unsigned int pointCount = inputMatrixArrayPlug.numElements();
9595

@@ -174,7 +174,7 @@ InputLocatorNode::compute(
174174
);
175175

176176
MDataHandle outputNodeIdHandle =
177-
dataBlock.outputValue(InputLocatorNode::outputNodeId);
177+
dataBlock.outputValue(InputTransformNode::outputNodeId);
178178

179179
outputNodeIdHandle.setInt(myGeometryNodeId);
180180

‎InputLocatorNode.h ‎InputTransformNode.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#ifndef __InputLocatorNode_h__
2-
#define __InputLocatorNode_h__
1+
#ifndef __InputTransformNode_h__
2+
#define __InputTransformNode_h__
33

44
#include <maya/MPxNode.h>
55

66
#include <HAPI_Common.h>
77

8-
class InputLocatorNode : public MPxNode
8+
class InputTransformNode : public MPxNode
99
{
1010
public:
1111
static void* creator();
@@ -21,8 +21,8 @@ class InputLocatorNode : public MPxNode
2121
static MObject outputNodeId;
2222

2323
public:
24-
InputLocatorNode();
25-
virtual ~InputLocatorNode();
24+
InputTransformNode();
25+
virtual ~InputTransformNode();
2626

2727
virtual MStatus compute(
2828
const MPlug &plug,

‎MayaTypeID.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum MayaTypeID
3838
MayaTypeID_HoudiniFluidGridConvert = 0x0011E241,
3939
MayaTypeID_HoudiniInputGeometryNode = 0x0011E242,
4040
MayaTypeID_HoudiniInputCurveNode = 0x0011E243,
41-
MayaTypeID_HoudiniInputLocatorNode = 0x0011E244,
41+
MayaTypeID_HoudiniInputTransformNode = 0x0011E244,
4242
MayaTypeID_HoudiniInputMergeNode = 0x0011E245,
4343
MayaTypeID_HoudiniOutputPartInstancerNode = 0x0011E246,
4444
};

‎plugin.C

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "InputCurveNode.h"
1212
#include "FluidGridConvert.h"
1313
#include "InputGeometryNode.h"
14-
#include "InputLocatorNode.h"
14+
#include "InputTransformNode.h"
1515
#include "InputMergeNode.h"
1616
#include "OutputPartInstancerNode.h"
1717
#include "util.h"
@@ -566,10 +566,10 @@ initializePlugin(MObject obj)
566566
CHECK_MSTATUS_AND_RETURN_IT(status);
567567

568568
status = plugin.registerNode(
569-
InputLocatorNode::typeName,
570-
InputLocatorNode::typeId,
571-
InputLocatorNode::creator,
572-
InputLocatorNode::initialize
569+
InputTransformNode::typeName,
570+
InputTransformNode::typeId,
571+
InputTransformNode::creator,
572+
InputTransformNode::initialize
573573
);
574574
CHECK_MSTATUS_AND_RETURN_IT(status);
575575

@@ -638,7 +638,7 @@ uninitializePlugin(MObject obj)
638638
status = plugin.deregisterNode(InputCurveNode::typeId);
639639
CHECK_MSTATUS_AND_RETURN_IT(status);
640640

641-
status = plugin.deregisterNode(InputLocatorNode::typeId);
641+
status = plugin.deregisterNode(InputTransformNode::typeId);
642642
CHECK_MSTATUS_AND_RETURN_IT(status);
643643

644644
status = plugin.deregisterNode(InputMergeNode::typeId);

‎scripts/houdiniEngineAssetInput.mel

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ validateInputObjects(string $objects[],
2222
int $validObjectsCount = 0;
2323

2424
string $curveObjects[];
25-
string $locatorObjects[];
25+
string $transformObjects[];
2626

2727
while($objectsToProcessEnd)
2828
{
@@ -42,7 +42,7 @@ validateInputObjects(string $objects[],
4242
}
4343
else if(`objectType -isAType "houdiniInputGeometry" $object`
4444
|| `objectType -isAType "houdiniInputCurve" $object`
45-
|| `objectType -isAType "houdiniInputLocator" $object`
45+
|| `objectType -isAType "houdiniInputTransform" $object`
4646
|| `objectType -isAType "houdiniInputMerge" $object`)
4747
{
4848
$validObjects[size($validObjects)] = $object;
@@ -54,7 +54,7 @@ validateInputObjects(string $objects[],
5454
}
5555
else if(`objectType -isAType "locator" $object`)
5656
{
57-
$locatorObjects[size($locatorObjects)] = $object;
57+
$transformObjects[size($transformObjects)] = $object;
5858
}
5959
else if(`objectType -isAType "mesh" $object`
6060
|| `objectType -isAType "particle" $object`
@@ -86,10 +86,10 @@ validateInputObjects(string $objects[],
8686
$validObjectsCount++;
8787
}
8888

89-
if(size($locatorObjects))
89+
if(size($transformObjects))
9090
{
91-
$locatorObjects = stringArrayRemoveDuplicates($locatorObjects);
92-
$multiObjects[1] = stringArrayToString($locatorObjects, " ");
91+
$transformObjects = stringArrayRemoveDuplicates($transformObjects);
92+
$multiObjects[1] = stringArrayToString($transformObjects, " ");
9393
$validObjectsCount++;
9494
}
9595

@@ -134,7 +134,7 @@ getInputNodeForSingle(string $object)
134134
}
135135
else if(`objectType -isAType "houdiniInputGeometry" $object`
136136
|| `objectType -isAType "houdiniInputCurve" $object`
137-
|| `objectType -isAType "houdiniInputLocator" $object`
137+
|| `objectType -isAType "houdiniInputTransform" $object`
138138
|| `objectType -isAType "houdiniInputMerge" $object`)
139139
{
140140
return ($object + ".outputNodeId");
@@ -235,12 +235,12 @@ getInputNodeForMultiple(int $type, string $objects[])
235235
($inputNode + ".inputCurve[" + $i + "]");
236236
}
237237
break;
238-
// locator
238+
// transform
239239
case 1:
240240
if(!size($objects))
241241
return "";
242242

243-
$inputNode = `createNode -skipSelect "houdiniInputLocator"`;
243+
$inputNode = `createNode -skipSelect "houdiniInputTransform"`;
244244

245245
for($i = 0; $i < size($objects); $i++)
246246
{
@@ -271,7 +271,7 @@ houdiniEngine_clearAssetInput(string $inputAttr)
271271
string $sourceInputNode = `plugNode($sourceInputPlug)`;
272272
if(`nodeType $sourceInputNode` == "houdiniInputGeometry"
273273
|| `nodeType $sourceInputNode` == "houdiniInputCurve"
274-
|| `nodeType $sourceInputNode` == "houdiniInputLocator"
274+
|| `nodeType $sourceInputNode` == "houdiniInputTransform"
275275
|| `nodeType $sourceInputNode` == "houdiniInputMerge")
276276
{
277277
// if houdiniInputGeometry node is no longer outputting to anything anymore,
@@ -412,7 +412,7 @@ houdiniEngine_getAssetInput(string $inputAttr)
412412
$inputGeometryNodes[size($inputGeometryNodes)] = plugNode($plug);
413413
}
414414
}
415-
else if(`nodeType $inputNode` == "houdiniInputLocator")
415+
else if(`nodeType $inputNode` == "houdiniInputTransform")
416416
{
417417
string $plugs[] = `listConnections
418418
-plugs true -destination true

0 commit comments

Comments
 (0)