Skip to content

Commit 26f7ba2

Browse files
author
Angel Zhang
committed
Bumping to Houdini Version: 20.5.68
Houdini Engine Version: 7.0 (API: 0)
1 parent 59112cd commit 26f7ba2

File tree

3 files changed

+281
-6
lines changed

3 files changed

+281
-6
lines changed

‎Plugins/HoudiniEngineUnity/Scripts/HAPI/HEU_HAPIFunctions.cs‎

Lines changed: 269 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ public static class HEU_HAPIFunctions
7272
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
7373
public static extern HAPI_Result
7474
HAPI_CreateInProcessSession(
75-
out HAPI_Session session);
75+
out HAPI_Session session,
76+
ref HAPI_SessionInfo session_info);
7677
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
7778
public static extern HAPI_Result
7879
HAPI_StartThriftSocketServer(
@@ -85,7 +86,8 @@ public static extern HAPI_Result
8586
HAPI_CreateThriftSocketSession(
8687
out HAPI_Session session,
8788
byte[] host_name,
88-
int port);
89+
int port,
90+
ref HAPI_SessionInfo session_info);
8991
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
9092
public static extern HAPI_Result
9193
HAPI_StartThriftNamedPipeServer(
@@ -97,7 +99,8 @@ public static extern HAPI_Result
9799
public static extern HAPI_Result
98100
HAPI_CreateThriftNamedPipeSession(
99101
out HAPI_Session session,
100-
byte[] pipe_name);
102+
byte[] pipe_name,
103+
ref HAPI_SessionInfo session_info);
101104
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
102105
public static extern HAPI_Result
103106
HAPI_BindCustomImplementation(
@@ -968,6 +971,21 @@ public static extern HAPI_Result
968971
int buffer_length);
969972
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
970973
public static extern HAPI_Result
974+
HAPI_GetPresetCount(
975+
ref HAPI_Session session,
976+
byte[] buffer,
977+
int buffer_length,
978+
out int count);
979+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
980+
public static extern HAPI_Result
981+
HAPI_GetPresetNames(
982+
ref HAPI_Session session,
983+
byte[] buffer,
984+
int buffer_length,
985+
[Out] HAPI_StringHandle[] preset_names_array,
986+
int count);
987+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
988+
public static extern HAPI_Result
971989
HAPI_GetObjectInfo(
972990
ref HAPI_Session session,
973991
HAPI_NodeId node_id,
@@ -1329,6 +1347,254 @@ public static extern HAPI_Result
13291347
int sizes_fixed_length);
13301348
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
13311349
public static extern HAPI_Result
1350+
HAPI_GetAttributeIntDataAsync(
1351+
ref HAPI_Session session,
1352+
HAPI_NodeId node_id,
1353+
HAPI_PartId part_id,
1354+
byte[] name,
1355+
ref HAPI_AttributeInfo attr_info,
1356+
int stride,
1357+
[Out] int[] data_array,
1358+
int start,
1359+
int length,
1360+
out int job_id);
1361+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1362+
public static extern HAPI_Result
1363+
HAPI_GetAttributeUInt8DataAsync(
1364+
ref HAPI_Session session,
1365+
HAPI_NodeId node_id,
1366+
HAPI_PartId part_id,
1367+
byte[] name,
1368+
ref HAPI_AttributeInfo attr_info,
1369+
int stride,
1370+
[Out] HAPI_UInt8[] data_array,
1371+
int start,
1372+
int length,
1373+
out int job_id);
1374+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1375+
public static extern HAPI_Result
1376+
HAPI_GetAttributeInt8DataAsync(
1377+
ref HAPI_Session session,
1378+
HAPI_NodeId node_id,
1379+
HAPI_PartId part_id,
1380+
byte[] name,
1381+
ref HAPI_AttributeInfo attr_info,
1382+
int stride,
1383+
[Out] HAPI_Int8[] data_array,
1384+
int start,
1385+
int length,
1386+
out int job_id);
1387+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1388+
public static extern HAPI_Result
1389+
HAPI_GetAttributeInt16DataAsync(
1390+
ref HAPI_Session session,
1391+
HAPI_NodeId node_id,
1392+
HAPI_PartId part_id,
1393+
byte[] name,
1394+
ref HAPI_AttributeInfo attr_info,
1395+
int stride,
1396+
[Out] HAPI_Int16[] data_array,
1397+
int start,
1398+
int length,
1399+
out int job_id);
1400+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1401+
public static extern HAPI_Result
1402+
HAPI_GetAttributeInt64DataAsync(
1403+
ref HAPI_Session session,
1404+
HAPI_NodeId node_id,
1405+
HAPI_PartId part_id,
1406+
byte[] name,
1407+
ref HAPI_AttributeInfo attr_info,
1408+
int stride,
1409+
[Out] HAPI_Int64[] data_array,
1410+
int start,
1411+
int length,
1412+
out int job_id);
1413+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1414+
public static extern HAPI_Result
1415+
HAPI_GetAttributeFloatDataAsync(
1416+
ref HAPI_Session session,
1417+
HAPI_NodeId node_id,
1418+
HAPI_PartId part_id,
1419+
byte[] name,
1420+
ref HAPI_AttributeInfo attr_info,
1421+
int stride,
1422+
[Out] float[] data_array,
1423+
int start,
1424+
int length,
1425+
out int job_id);
1426+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1427+
public static extern HAPI_Result
1428+
HAPI_GetAttributeFloat64DataAsync(
1429+
ref HAPI_Session session,
1430+
HAPI_NodeId node_id,
1431+
HAPI_PartId part_id,
1432+
byte[] name,
1433+
ref HAPI_AttributeInfo attr_info,
1434+
int stride,
1435+
[Out] double[] data_array,
1436+
int start,
1437+
int length,
1438+
out int job_id);
1439+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1440+
public static extern HAPI_Result
1441+
HAPI_GetAttributeStringDataAsync(
1442+
ref HAPI_Session session,
1443+
HAPI_NodeId node_id,
1444+
HAPI_PartId part_id,
1445+
byte[] name,
1446+
ref HAPI_AttributeInfo attr_info,
1447+
int stride,
1448+
[Out] HAPI_StringHandle[] data_array,
1449+
int start,
1450+
int length,
1451+
out int job_id);
1452+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1453+
public static extern HAPI_Result
1454+
HAPI_GetAttributeDictionaryDataAsync(
1455+
ref HAPI_Session session,
1456+
HAPI_NodeId node_id,
1457+
HAPI_PartId part_id,
1458+
byte[] name,
1459+
ref HAPI_AttributeInfo attr_info,
1460+
int stride,
1461+
[Out] HAPI_StringHandle[] data_array,
1462+
int start,
1463+
int length,
1464+
out int job_id);
1465+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1466+
public static extern HAPI_Result
1467+
HAPI_GetAttributeIntArrayDataAsync(
1468+
ref HAPI_Session session,
1469+
HAPI_NodeId node_id,
1470+
HAPI_PartId part_id,
1471+
byte[] attr_name,
1472+
ref HAPI_AttributeInfo attr_info,
1473+
[Out] int[] data_fixed_array,
1474+
int data_fixed_length,
1475+
[Out] int[] sizes_fixed_array,
1476+
int start,
1477+
int sizes_fixed_length,
1478+
out int job_id);
1479+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1480+
public static extern HAPI_Result
1481+
HAPI_GetAttributeUInt8ArrayDataAsync(
1482+
ref HAPI_Session session,
1483+
HAPI_NodeId node_id,
1484+
HAPI_PartId part_id,
1485+
byte[] attr_name,
1486+
ref HAPI_AttributeInfo attr_info,
1487+
[Out] HAPI_UInt8[] data_fixed_array,
1488+
int data_fixed_length,
1489+
[Out] int[] sizes_fixed_array,
1490+
int start,
1491+
int sizes_fixed_length,
1492+
out int job_id);
1493+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1494+
public static extern HAPI_Result
1495+
HAPI_GetAttributeInt8ArrayDataAsync(
1496+
ref HAPI_Session session,
1497+
HAPI_NodeId node_id,
1498+
HAPI_PartId part_id,
1499+
byte[] attr_name,
1500+
ref HAPI_AttributeInfo attr_info,
1501+
[Out] HAPI_Int8[] data_fixed_array,
1502+
int data_fixed_length,
1503+
[Out] int[] sizes_fixed_array,
1504+
int start,
1505+
int sizes_fixed_length,
1506+
out int job_id);
1507+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1508+
public static extern HAPI_Result
1509+
HAPI_GetAttributeInt16ArrayDataAsync(
1510+
ref HAPI_Session session,
1511+
HAPI_NodeId node_id,
1512+
HAPI_PartId part_id,
1513+
byte[] attr_name,
1514+
ref HAPI_AttributeInfo attr_info,
1515+
[Out] HAPI_Int16[] data_fixed_array,
1516+
int data_fixed_length,
1517+
[Out] int[] sizes_fixed_array,
1518+
int start,
1519+
int sizes_fixed_length,
1520+
out int job_id);
1521+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1522+
public static extern HAPI_Result
1523+
HAPI_GetAttributeInt64ArrayDataAsync(
1524+
ref HAPI_Session session,
1525+
HAPI_NodeId node_id,
1526+
HAPI_PartId part_id,
1527+
byte[] attr_name,
1528+
ref HAPI_AttributeInfo attr_info,
1529+
[Out] HAPI_Int64[] data_fixed_array,
1530+
int data_fixed_length,
1531+
[Out] int[] sizes_fixed_array,
1532+
int start,
1533+
int sizes_fixed_length,
1534+
out int job_id);
1535+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1536+
public static extern HAPI_Result
1537+
HAPI_GetAttributeFloatArrayDataAsync(
1538+
ref HAPI_Session session,
1539+
HAPI_NodeId node_id,
1540+
HAPI_PartId part_id,
1541+
byte[] attr_name,
1542+
ref HAPI_AttributeInfo attr_info,
1543+
[Out] float[] data_fixed_array,
1544+
int data_fixed_length,
1545+
[Out] int[] sizes_fixed_array,
1546+
int start,
1547+
int sizes_fixed_length,
1548+
out int job_id);
1549+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1550+
public static extern HAPI_Result
1551+
HAPI_GetAttributeFloat64ArrayDataAsync(
1552+
ref HAPI_Session session,
1553+
HAPI_NodeId node_id,
1554+
HAPI_PartId part_id,
1555+
byte[] attr_name,
1556+
ref HAPI_AttributeInfo attr_info,
1557+
[Out] double[] data_fixed_array,
1558+
int data_fixed_length,
1559+
[Out] int[] sizes_fixed_array,
1560+
int start,
1561+
int sizes_fixed_length,
1562+
out int job_id);
1563+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1564+
public static extern HAPI_Result
1565+
HAPI_GetAttributeStringArrayDataAsync(
1566+
ref HAPI_Session session,
1567+
HAPI_NodeId node_id,
1568+
HAPI_PartId part_id,
1569+
byte[] attr_name,
1570+
ref HAPI_AttributeInfo attr_info,
1571+
[Out] HAPI_StringHandle[] data_fixed_array,
1572+
int data_fixed_length,
1573+
[Out] int[] sizes_fixed_array,
1574+
int start,
1575+
int sizes_fixed_length,
1576+
out int job_id);
1577+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1578+
public static extern HAPI_Result
1579+
HAPI_GetAttributeDictionaryArrayDataAsync(
1580+
ref HAPI_Session session,
1581+
HAPI_NodeId node_id,
1582+
HAPI_PartId part_id,
1583+
byte[] attr_name,
1584+
ref HAPI_AttributeInfo attr_info,
1585+
[Out] HAPI_StringHandle[] data_fixed_array,
1586+
int data_fixed_length,
1587+
[Out] int[] sizes_fixed_array,
1588+
int start,
1589+
int sizes_fixed_length,
1590+
out int job_id);
1591+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1592+
public static extern HAPI_Result
1593+
HAPI_GetAttributeWait(
1594+
ref HAPI_Session session,
1595+
int job_id);
1596+
[DllImport(HEU_HoudiniVersion.HAPI_LIBRARY, CallingConvention = CallingConvention.Cdecl)]
1597+
public static extern HAPI_Result
13321598
HAPI_GetGroupNames(
13331599
ref HAPI_Session session,
13341600
HAPI_NodeId node_id,

‎Plugins/HoudiniEngineUnity/Scripts/HAPI/HEU_HAPIStructs.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,15 @@ public partial struct HAPI_Session //Identifies a session
111111

112112
};
113113

114+
[StructLayout(LayoutKind.Sequential)]
115+
[Serializable]
116+
public partial struct HAPI_SessionInfo //Configurations for sessions
117+
{
118+
[MarshalAs(UnmanagedType.I4)]
119+
public int connectionCount; //The number of subconnections in this session
120+
121+
};
122+
114123
[StructLayout(LayoutKind.Sequential)]
115124
public partial struct HAPI_ThriftServerOptions //Options to configure a Thrift server being started from HARC.
116125
{

‎Plugins/HoudiniEngineUnity/Scripts/HEU_HoudiniVersion.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public class HEU_HoudiniVersion
4141
{
4242
public const int HOUDINI_MAJOR = 20;
4343
public const int HOUDINI_MINOR = 5;
44-
public const int HOUDINI_BUILD = 10;
44+
public const int HOUDINI_BUILD = 68;
4545
public const int HOUDINI_PATCH = 0;
4646

47-
public const string HOUDINI_VERSION_STRING = "20.5.10";
47+
public const string HOUDINI_VERSION_STRING = "20.5.68";
4848

49-
public const int HOUDINI_ENGINE_MAJOR = 6;
49+
public const int HOUDINI_ENGINE_MAJOR = 7;
5050
public const int HOUDINI_ENGINE_MINOR = 0;
5151

5252
public const int HOUDINI_ENGINE_API = 0;

0 commit comments

Comments
 (0)