|
@@ -1499,8 +1499,6 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialFloatArray(
|
|
ai_real *pOut,
|
|
ai_real *pOut,
|
|
unsigned int *pMax);
|
|
unsigned int *pMax);
|
|
|
|
|
|
-#if 1 //def __cplusplus
|
|
|
|
-
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ---------------------------------------------------------------------------
|
|
/** @brief Retrieve a single float property with a specific key from the material.
|
|
/** @brief Retrieve a single float property with a specific key from the material.
|
|
*
|
|
*
|
|
@@ -1528,14 +1526,6 @@ inline aiReturn aiGetMaterialFloat(const C_STRUCT aiMaterial *pMat,
|
|
return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
|
|
return aiGetMaterialFloatArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
|
|
}
|
|
}
|
|
|
|
|
|
-#else
|
|
|
|
-
|
|
|
|
-// Use our friend, the C preprocessor // The macro does not work with e.g. AI_MATKEY_OPACITY expanding into 3 args
|
|
|
|
-#define aiGetMaterialFloat(pMat, type, index, pKey, pOut) \
|
|
|
|
- aiGetMaterialFloatArray(pMat, type, index, pKey, pOut, NULL)
|
|
|
|
-
|
|
|
|
-#endif //!__cplusplus
|
|
|
|
-
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ---------------------------------------------------------------------------
|
|
/** @brief Retrieve an array of integer values with a specific key
|
|
/** @brief Retrieve an array of integer values with a specific key
|
|
* from a material
|
|
* from a material
|
|
@@ -1548,8 +1538,6 @@ ASSIMP_API C_ENUM aiReturn aiGetMaterialIntegerArray(const C_STRUCT aiMaterial *
|
|
int *pOut,
|
|
int *pOut,
|
|
unsigned int *pMax);
|
|
unsigned int *pMax);
|
|
|
|
|
|
-#if 1 //def __cplusplus
|
|
|
|
-
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ---------------------------------------------------------------------------
|
|
/** @brief Retrieve an integer property with a specific key from a material
|
|
/** @brief Retrieve an integer property with a specific key from a material
|
|
*
|
|
*
|
|
@@ -1563,14 +1551,6 @@ inline aiReturn aiGetMaterialInteger(const C_STRUCT aiMaterial *pMat,
|
|
return aiGetMaterialIntegerArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
|
|
return aiGetMaterialIntegerArray(pMat, pKey, type, index, pOut, (unsigned int *)0x0);
|
|
}
|
|
}
|
|
|
|
|
|
-#else
|
|
|
|
-
|
|
|
|
-// use our friend, the C preprocessor
|
|
|
|
-#define aiGetMaterialInteger(pMat, type, index, pKey, pOut) \
|
|
|
|
- aiGetMaterialIntegerArray(pMat, type, index, pKey, pOut, NULL)
|
|
|
|
-
|
|
|
|
-#endif //!__cplusplus
|
|
|
|
-
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// ---------------------------------------------------------------------------
|
|
/** @brief Retrieve a color value from the material property table
|
|
/** @brief Retrieve a color value from the material property table
|
|
*
|
|
*
|