FIX: NFF face winding bug (actually it was in StandardShapes.cpp).
FIX: StandardShapes::MakeCone() - face order was incorrect in 50% of all cases. Implemented StandardShapes::MakeCircle(). Fixed a compiler warning in B3DImporter.cpp. Modified cone.nff - one texture isn't found, that's ok. The mapping should be better visible now. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@299 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -153,9 +153,9 @@ public:
|
||||
*
|
||||
* |-----| <- radius 1
|
||||
*
|
||||
* __x__ <- ]
|
||||
* / \ | height
|
||||
* / \ |
|
||||
* __x__ <- ] ^
|
||||
* / \ | height |
|
||||
* / \ | Y
|
||||
* / \ |
|
||||
* / \ |
|
||||
* /______x______\ <- ] <- end cap
|
||||
@@ -180,16 +180,14 @@ public:
|
||||
// ----------------------------------------------------------------
|
||||
/** @brief Generates a flat circle
|
||||
*
|
||||
* @param center Center point of the circle
|
||||
* The circle is constructed in the planed formed by the x,z
|
||||
* axes of the cartesian coordinate system.
|
||||
*
|
||||
* @param radius Radius of the circle
|
||||
* @param normal Normal vector of the circle.
|
||||
* This is also the normal vector of all triangles generated by
|
||||
* this function.
|
||||
* @param tess Number of segments.
|
||||
* @param positions Receives output triangles.
|
||||
*/
|
||||
static void MakeCircle(const aiVector3D& center, const aiVector3D& normal,
|
||||
float radius, unsigned int tess,
|
||||
static void MakeCircle(float radius, unsigned int tess,
|
||||
std::vector<aiVector3D>& positions);
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user