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

Merge branch 'master' into add_null_check_py

pull/2490/head
Kim Kulling 2019-06-02 12:54:51 +02:00 committed by GitHub
parent 3924a5c32a 0215d77abd
commit f0f2a7fc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 46 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -7,6 +7,12 @@ build
*.sln *.sln
*.ncb *.ncb
*.vcproj *.vcproj
*.vcxproj.user
*.VC.db
*.VC.db-shm
*.VC.db-wal
*.VC.opendb
*.ipch
# Output # Output
bin/ bin/
@ -32,6 +38,7 @@ cmake_uninstall.cmake
*.dir/ *.dir/
assimp-config.cmake assimp-config.cmake
assimp-config-version.cmake assimp-config-version.cmake
assimpTargets*.cmake
# MakeFile # MakeFile
Makefile Makefile

6
code/FBXParser.cpp
View File

@ -643,9 +643,9 @@ void ParseVectorDataArray(std::vector<aiVector3D>& out, const Element& el)
if (type == 'd') { if (type == 'd') {
const double* d = reinterpret_cast<const double*>(&buff[0]); const double* d = reinterpret_cast<const double*>(&buff[0]);
for (unsigned int i = 0; i < count3; ++i, d += 3) { for (unsigned int i = 0; i < count3; ++i, d += 3) {
out.push_back(aiVector3D(static_cast<float>(d[0]), out.push_back(aiVector3D(static_cast<ai_real>(d[0]),
static_cast<float>(d[1]), static_cast<ai_real>(d[1]),
static_cast<float>(d[2]))); static_cast<ai_real>(d[2])));
} }
// for debugging // for debugging
/*for ( size_t i = 0; i < out.size(); i++ ) { /*for ( size_t i = 0; i < out.size(); i++ ) {

2
code/Importer/IFC/IFCBoolean.cpp
View File

@ -256,7 +256,7 @@ bool IntersectsBoundaryProfile(const IfcVector3& e0, const IfcVector3& e1, const
for( size_t i = 0, bcount = boundary.size(); i < bcount; ++i ) { for( size_t i = 0, bcount = boundary.size(); i < bcount; ++i ) {
IfcVector3 b01 = boundary[(i + 1) % bcount] - boundary[i]; IfcVector3 b01 = boundary[(i + 1) % bcount] - boundary[i];
IfcVector3 b12 = boundary[(i + 2) % bcount] - boundary[(i + 1) % bcount]; IfcVector3 b12 = boundary[(i + 2) % bcount] - boundary[(i + 1) % bcount];
IfcVector3 b1_side = IfcVector3(b01.y, -b01.x, 0.0); // rotated 90° clockwise in Z plane IfcVector3 b1_side = IfcVector3(b01.y, -b01.x, 0.0); // rotated 90° clockwise in Z plane
// Warning: rough estimate only. A concave poly with lots of small segments each featuring a small counter rotation // Warning: rough estimate only. A concave poly with lots of small segments each featuring a small counter rotation
// could fool the accumulation. Correct implementation would be sum( acos( b01 * b2) * sign( b12 * b1_side)) // could fool the accumulation. Correct implementation would be sum( acos( b01 * b2) * sign( b12 * b1_side))
windingOrder += (b1_side.x*b12.x + b1_side.y*b12.y); windingOrder += (b1_side.x*b12.x + b1_side.y*b12.y);

4
code/res/resource.h
View File

@ -2,8 +2,8 @@
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by assimp.rc // Used by assimp.rc
// Nächste Standardwerte für neue Objekte // Next standard values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101 #define _APS_NEXT_RESOURCE_VALUE 101

2
contrib/irrXML/irrString.h
View File

@ -19,7 +19,7 @@ so you can assign unicode to string<c8> and ascii to string<wchar_t>
Note that the conversation between both is not done using an encoding. Note that the conversation between both is not done using an encoding.
Known bugs: Known bugs:
Special characters like 'Ä', 'Ü' and 'Ö' are ignored in the Special characters like 'Ä', 'Ü' and 'Ö' are ignored in the
methods make_upper, make_lower and equals_ignore_case. methods make_upper, make_lower and equals_ignore_case.
*/ */
template <class T> template <class T>

2
contrib/poly2tri/AUTHORS
View File

@ -1,7 +1,7 @@
Primary Contributors: Primary Contributors:
Mason Green <mason.green@gmail.com> (C++, Python) Mason Green <mason.green@gmail.com> (C++, Python)
Thomas Åhlén <thahlen@gmail.com> (Java) Thomas Åhlén <thahlen@gmail.com> (Java)
Other Contributors: Other Contributors:

4
contrib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -199,4 +199,4 @@ namespace DotZLib
} }
#endregion #endregion
} }

2
contrib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
contrib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
contrib/zlib/contrib/dotzlib/DotZLib/Deflater.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
contrib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
contrib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
contrib/zlib/contrib/dotzlib/DotZLib/Inflater.cs
View File

@ -1,5 +1,5 @@
// //
// © Copyright Henrik Ravn 2004 // © Copyright Henrik Ravn 2004
// //
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. // Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/assimp/defs.h
View File

@ -293,7 +293,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _MSC_VER #ifndef _MSC_VER
# define AI_NO_EXCEPT noexcept # define AI_NO_EXCEPT noexcept
#else #else
# if (_MSC_VER == 1915 ) # if (_MSC_VER >= 1915 )
# define AI_NO_EXCEPT noexcept # define AI_NO_EXCEPT noexcept
# else # else
# define AI_NO_EXCEPT # define AI_NO_EXCEPT

9
tools/assimp_cmd/Info.cpp
View File

@ -317,10 +317,15 @@ int Assimp_Info (const char* const* params, unsigned int num) {
return 1; return 1;
} }
// do maximum post-processing unless -r was specified // Parse post-processing flags unless -r was specified
ImportData import; ImportData import;
if (!raw) { if (!raw) {
import.ppFlags = aiProcessPreset_TargetRealtime_MaxQuality; // get import flags
ProcessStandardArguments(import, params + 1, num - 1);
//No custom post process flags defined, we set all the post process flags active
if(import.ppFlags == 0)
import.ppFlags |= aiProcessPreset_TargetRealtime_MaxQuality;
} }
// import the main model // import the main model

4
tools/assimp_view/stdafx.cpp
View File

@ -1,8 +1,8 @@
// stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet. // stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet.
// assimp_view.pch ist der vorkompilierte Header. // assimp_view.pch ist der vorkompilierte Header.
// stdafx.obj enthält die vorkompilierten Typinformationen. // stdafx.obj enthält die vorkompilierten Typinformationen.
#include "stdafx.h" #include "stdafx.h"
// TODO: Auf zusätzliche Header verweisen, die in STDAFX.H // TODO: Auf zusätzliche Header verweisen, die in STDAFX.H
// und nicht in dieser Datei erforderlich sind. // und nicht in dieser Datei erforderlich sind.

26
tools/assimp_view/stdafx.h
View File

@ -1,26 +1,26 @@
// stdafx.h : Includedatei für Standardsystem-Includedateien // stdafx.h : Includedatei für Standardsystem-Includedateien
// oder häufig verwendete projektspezifische Includedateien, // oder häufig verwendete projektspezifische Includedateien,
// die nur in unregelmäßigen Abständen geändert werden. // die nur in unregelmäßigen Abständen geändert werden.
// //
#pragma once #pragma once
// Ändern Sie folgende Definitionen für Plattformen, die älter als die unten angegebenen sind. // Ändern Sie folgende Definitionen für Plattformen, die älter als die unten angegebenen sind.
// In MSDN finden Sie die neuesten Informationen über die entsprechenden Werte für die unterschiedlichen Plattformen. // In MSDN finden Sie die neuesten Informationen über die entsprechenden Werte für die unterschiedlichen Plattformen.
#ifndef WINVER // Lassen Sie die Verwendung spezifischer Features von Windows XP oder später zu. #ifndef WINVER // Lassen Sie die Verwendung spezifischer Features von Windows XP oder später zu.
# define WINVER 0x0501 // Ändern Sie dies in den geeigneten Wert für andere Versionen von Windows. # define WINVER 0x0501 // Ändern Sie dies in den geeigneten Wert für andere Versionen von Windows.
#endif #endif
#ifndef _WIN32_WINNT // Lassen Sie die Verwendung spezifischer Features von Windows XP oder später zu. #ifndef _WIN32_WINNT // Lassen Sie die Verwendung spezifischer Features von Windows XP oder später zu.
# define _WIN32_WINNT 0x0501 // Ändern Sie dies in den geeigneten Wert für andere Versionen von Windows. # define _WIN32_WINNT 0x0501 // Ändern Sie dies in den geeigneten Wert für andere Versionen von Windows.
#endif #endif
#ifndef _WIN32_WINDOWS // Lassen Sie die Verwendung spezifischer Features von Windows 98 oder später zu. #ifndef _WIN32_WINDOWS // Lassen Sie die Verwendung spezifischer Features von Windows 98 oder später zu.
# define _WIN32_WINDOWS 0x0410 // Ändern Sie dies in den geeigneten Wert für Windows Me oder höher. # define _WIN32_WINDOWS 0x0410 // Ändern Sie dies in den geeigneten Wert für Windows Me oder höher.
#endif #endif
#ifndef _WIN32_IE // Lassen Sie die Verwendung spezifischer Features von IE 6.0 oder später zu. #ifndef _WIN32_IE // Lassen Sie die Verwendung spezifischer Features von IE 6.0 oder später zu.
#define _WIN32_IE 0x0600 // Ändern Sie dies in den geeigneten Wert für andere Versionen von IE. #define _WIN32_IE 0x0600 // Ändern Sie dies in den geeigneten Wert für andere Versionen von IE.
#endif #endif
// Windows-Headerdateien: // Windows-Headerdateien: