TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 12:30:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated assimp to latest

Browse source
This commit is contained in:
Areloch 2019-03-05 14:39:38 -06:00
parent 25ce4477ce
commit 161bf7f83b
461 changed files with 34662 additions and 30165 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/lib/assimp/code/X3DImporter_Geometry3D.cpp
View file

@ -2,7 +2,8 @@
Open Asset Import Library (assimp)
----------------------------------------------------------------------
Copyright (c) 2006-2017, assimp team
Copyright (c) 2006-2019, assimp team
All rights reserved.
@ -49,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "X3DImporter_Macro.hpp"
// Header files, Assimp.
#include "StandardShapes.h"
#include <assimp/StandardShapes.h>
namespace Assimp
{
@ -135,7 +136,7 @@ void X3DImporter::ParseNode_Geometry3D_Cone()
}
else
{
const unsigned int tess = 30;///TODO: IME tesselation factor through ai_property
const unsigned int tess = 30;///TODO: IME tessellation factor through ai_property
std::vector<aiVector3D> tvec;// temp array for vertices.
@ -208,7 +209,7 @@ void X3DImporter::ParseNode_Geometry3D_Cylinder()
}
else
{
const unsigned int tess = 30;///TODO: IME tesselation factor through ai_property
const unsigned int tess = 30;///TODO: IME tessellation factor through ai_property
std::vector<aiVector3D> tside;// temp array for vertices of side.
std::vector<aiVector3D> tcir;// temp array for vertices of circle.
@ -479,7 +480,7 @@ static aiVector3D GeometryHelper_Extrusion_GetNextY(const size_t pSpine_PointIdx
tvec = pSpine[1] - pSpine[0];
}
else
{// The Y-axis used for the last point it is the vector from spine[n-2] to spine[n-1]. In our case(see above about droping tail) spine[n - 1] is
{// The Y-axis used for the last point it is the vector from spine[n-2] to spine[n-1]. In our case(see above about dropping tail) spine[n - 1] is
// the spine[0].
tvec = pSpine[spine_idx_last] - pSpine[spine_idx_last - 1];
}
@ -966,7 +967,7 @@ void X3DImporter::ParseNode_Geometry3D_Sphere()
}
else
{
const unsigned int tess = 3;///TODO: IME tesselation factor through ai_property
const unsigned int tess = 3;///TODO: IME tessellation factor through ai_property
std::vector<aiVector3D> tlist;