Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build and merged master.

Browse Source
This commit is contained in:
Kim Kulling
2021-05-06 21:36:25 +02:00
parent 52228a93f8 b1b937ea79
commit 350f2ea1d3
1098 changed files with 72800 additions and 3960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/PostProcessing/ProcessHelper.h
View File

@@ -2,7 +2,7 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2020, assimp team
Copyright (c) 2006-2021, assimp team
All rights reserved.
@@ -138,7 +138,7 @@ inline ::aiVertexWeight min(const ::aiVertexWeight &a, const ::aiVertexWeight &b
// std::max for aiVertexWeight
inline ::aiVertexWeight max(const ::aiVertexWeight &a, const ::aiVertexWeight &b) {
return ::aiVertexWeight(static_cast<ai_real>(max(a.mVertexId, b.mVertexId)), static_cast<ai_real>(max(a.mWeight, b.mWeight)));
return ::aiVertexWeight(max(a.mVertexId, b.mVertexId), static_cast<ai_real>(max(a.mWeight, b.mWeight)));
}
} // end namespace std
@@ -244,7 +244,7 @@ inline void ArrayBounds(const T *in, unsigned int size, T &min, T &max) {
// -------------------------------------------------------------------------------
/** Little helper function to calculate the quadratic difference
* of two colours.
* of two colors.
* @param pColor1 First color
* @param pColor2 second color
* @return Quadratic color difference */
@@ -313,8 +313,8 @@ ai_real ComputePositionEpsilon(const aiMesh *const *pMeshes, size_t num);
unsigned int GetMeshVFormatUnique(const aiMesh *pcMesh);
// defs for ComputeVertexBoneWeightTable()
typedef std::pair<unsigned int, float> PerVertexWeight;
typedef std::vector<PerVertexWeight> VertexWeightTable;
using PerVertexWeight = std::pair<unsigned int, float>;
using VertexWeightTable = std::vector<PerVertexWeight>;
// -------------------------------------------------------------------------------
// Compute a per-vertex bone weight table
@@ -332,7 +332,7 @@ const char *MappingTypeToString(aiTextureMapping in);
aiMesh *MakeSubmesh(const aiMesh *superMesh, const std::vector<unsigned int> &subMeshFaces, unsigned int subFlags);
// -------------------------------------------------------------------------------
// Utility postprocess step to share the spatial sort tree between
// Utility post-process step to share the spatial sort tree between
// all steps which use it to speedup its computations.
class ComputeSpatialSortProcess : public BaseProcess {
bool IsActive(unsigned int pFlags) const {
@@ -372,4 +372,5 @@ class DestroySpatialSortProcess : public BaseProcess {
};
} // namespace Assimp
#endif // !! AI_PROCESS_HELPER_H_INCLUDED