v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml

pull/2966/head
Kim Kulling 2020-09-22 17:29:49 +02:00
parent 6e91605268 71f20eaa8a
commit 93ae409e74
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/AssetLib/Collada/ColladaParser.cpp
View File

@ -316,6 +316,8 @@ void ColladaParser::ReadAssetInfo(XmlNode &node) {
} }
} else if (name == "contributor") { } else if (name == "contributor") {
ReadMetaDataItem(currentNode, mAssetMetaData); ReadMetaDataItem(currentNode, mAssetMetaData);
} else {
ReadMetaDataItem(currentNode, mAssetMetaData);
} }
} }
} }
@ -408,6 +410,7 @@ void ColladaParser::PostProcessControllers() {
if (meshId.empty()) { if (meshId.empty()) {
continue; continue;
} }
ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId); ControllerLibrary::iterator findItr = mControllerLibrary.find(meshId);
while (findItr != mControllerLibrary.end()) { while (findItr != mControllerLibrary.end()) {
meshId = findItr->second.mMeshId; meshId = findItr->second.mMeshId;
@ -1442,6 +1445,7 @@ void ColladaParser::ReadDataArray(XmlNode &node) {
ai_real value; ai_real value;
// read a number // read a number
//SkipSpacesAndLineEnd(&content);
content = fast_atoreal_move<ai_real>(content, value); content = fast_atoreal_move<ai_real>(content, value);
data.mValues.push_back(value); data.mValues.push_back(value);
// skip whitespace after it // skip whitespace after it

5
include/assimp/StringUtils.h
View File

@ -52,6 +52,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <sstream> #include <sstream>
#include <stdarg.h> #include <stdarg.h>
#include <cstdlib> #include <cstdlib>
#include <algorithm>
#include <cctype>
#include <locale>
/// @fn ai_snprintf /// @fn ai_snprintf
/// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier. /// @brief The portable version of the function snprintf ( C99 standard ), which works on visual studio compilers 2013 and earlier.
@ -173,7 +176,7 @@ inline void ltrim(std::string &s) {
inline void rtrim(std::string &s) { inline void rtrim(std::string &s) {
s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) { s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
return !std::isspace(ch); return !std::isspace(ch);
}).base(),s.end()); }).base(), s.end());
} }
// trim from both ends (in place) // trim from both ends (in place)

3
test/unit/utColladaExport.cpp
View File

@ -47,6 +47,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/Exporter.hpp> #include <assimp/Exporter.hpp>
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <array>
#ifndef ASSIMP_BUILD_NO_EXPORT #ifndef ASSIMP_BUILD_NO_EXPORT
class utColladaExport : public ::testing::Test { class utColladaExport : public ::testing::Test {
@ -77,6 +79,7 @@ TEST_F(utColladaExport, testExportCamera) {
EXPECT_EQ(AI_SUCCESS, ex->Export(pTest, "collada", file)); EXPECT_EQ(AI_SUCCESS, ex->Export(pTest, "collada", file));
const unsigned int origNumCams(pTest->mNumCameras); const unsigned int origNumCams(pTest->mNumCameras);
//std::vector<float> origFOV;
std::unique_ptr<float[]> origFOV(new float[origNumCams]); std::unique_ptr<float[]> origFOV(new float[origNumCams]);
std::unique_ptr<float[]> orifClipPlaneNear(new float[origNumCams]); std::unique_ptr<float[]> orifClipPlaneNear(new float[origNumCams]);
std::unique_ptr<float[]> orifClipPlaneFar(new float[origNumCams]); std::unique_ptr<float[]> orifClipPlaneFar(new float[origNumCams]);

2
test/unit/utIssues.cpp
View File

@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using namespace Assimp; using namespace Assimp;
class utIssues : public ::testing::Test { class utIssues : public ::testing::Test {
// empty
}; };
#ifndef ASSIMP_BUILD_NO_EXPORT #ifndef ASSIMP_BUILD_NO_EXPORT