Skip to content

Commit

Permalink
- update CHANGES.current.
Browse files Browse the repository at this point in the history
- mark aiAnimMesh data structures as *NOT CURRENTLY USED*. They are, however, still contained and visible because some ports may be relying on their presence.
- add SimpleAssimpViewX sample provided by drparallax. Thanks! (http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829)


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@843 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
aramis_acg committed Nov 21, 2010
1 parent ec6ef9f commit 6f1408a
Show file tree
Hide file tree
Showing 24 changed files with 9,214 additions and 11 deletions.
42 changes: 42 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,48 @@
CHANGELOG
----------------------------------------------------------------------



2.0 (2010-11-21)

FEATURES:
- Add support for static Blender (*.blend) scenes
- Add support for Q3BSP scenes
- Add a windows-based OpenGL sample featuring texturing & basic materials
- Add an experimental progress feedback interface.
- Vastly improved performance (up to 500%, depending on mesh size and
spatial structure) in some expensive postprocessing steps
- AssimpView now uses a reworked layout which leaves more space
to the scene hierarchy window

- Add C# bindings ('Assimp.NET')

FIXES:
- Many Collada bugfixes, improve faul tolerance
- Fix possible crashes in the Obj loader
- Improve the Ogre XML loader
- OpenGL-sample now works with MinGW
- Fix Importer::FindLoader failing on uppercase file extensions
- Fix flawed path handling when locating external files
- Limit the maximum number of vertices, faces, face indices and
weights that Assimp is able to handle. This is to avoid
crashes due to overflowing counters.

- Updated XCode project files
- Further CMAKE build improvements


API CHANGES:
- Add data structures for vertex-based animations (These are not
currently used, however ...)
- Some Assimp::Importer methods are const now.







1.1 (2010-04-17)
This is the list of relevant changes from the 1.0 (r412) release to 1.1 (r700).

Expand Down
10 changes: 5 additions & 5 deletions code/AssimpPCH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ static const char* LEGAL_INFORMATION =
"Open Asset Import Library (Assimp).\n"
"A free C/C++ library to import various 3D file formats into applications\n\n"

"(c) ASSIMP Development Team, 2008-2010\n"
"License: 3-clause BSD license\n"
"Website: http://assimp.sourceforge.net\n"
"(c) 2008-2010, ASSIMP Development Team\n"
"License under the terms and conditions of the 3-clause BSD license\n"
"http://assimp.sourceforge.net\n"
;

// ------------------------------------------------------------------------------------------------
Expand All @@ -25,13 +25,13 @@ ASSIMP_API const char* aiGetLegalString () {
// ------------------------------------------------------------------------------------------------
// Get Assimp minor version
ASSIMP_API unsigned int aiGetVersionMinor () {
return 1;
return 0;
}

// ------------------------------------------------------------------------------------------------
// Get Assimp major version
ASSIMP_API unsigned int aiGetVersionMajor () {
return 1;
return 2;
}

// ------------------------------------------------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion code/BlenderLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ using namespace Assimp;
using namespace Assimp::Blender;
using namespace Assimp::Formatter;


static const aiLoaderDesc blenderDesc = {
"Blender 3D Importer \nhttp://www.blender3d.org",
"Alexander Gessler <[email protected]>",
"Assimp Team",
"",
"",
aiLoaderFlags_SupportBinaryFlavour | aiLoaderFlags_Experimental,
Expand All @@ -80,6 +81,7 @@ static const aiLoaderDesc blenderDesc = {
50
};


// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BlenderImporter::BlenderImporter()
Expand Down
16 changes: 12 additions & 4 deletions include/aiMesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,9 @@ enum aiPrimitiveType
((n) > 3 ? aiPrimitiveType_POLYGON : (aiPrimitiveType)(1u << ((n)-1)))



// ---------------------------------------------------------------------------
/** @brief An AnimMesh is an attachment to an #aiMesh stores per-vertex
/** @brief NOT CURRENTLY IN USE. An AnimMesh is an attachment to an #aiMesh stores per-vertex
* animations for a particular frame.
*
* You may think of an #aiAnimMesh as a `patch` for the host mesh, which
Expand Down Expand Up @@ -436,6 +437,7 @@ struct aiAnimMesh
#endif
};


// ---------------------------------------------------------------------------
/** @brief A mesh represents a geometry or model with a single material.
*
Expand Down Expand Up @@ -589,27 +591,32 @@ struct aiMesh
**/
C_STRUCT aiString mName;

/** The number of attachment meshes */

/** NOT CURRENTLY IN USE. The number of attachment meshes */
unsigned int mNumAnimMeshes;

/** Attachment meshes for this mesh, for vertex-based animation.
/** NOT CURRENTLY IN USE. Attachment meshes for this mesh, for vertex-based animation.
* Attachment meshes carry replacement data for some of the
* mesh'es vertex components (usually positions, normals). */
C_STRUCT aiAnimMesh** mAnimMeshes;


#ifdef __cplusplus

//! Default constructor. Initializes all members to 0
aiMesh()
{
mNumVertices = 0;
mNumFaces = 0;

mNumAnimMeshes = 0;

mPrimitiveTypes = 0;
mVertices = NULL; mFaces = NULL;
mNormals = NULL; mTangents = NULL;
mBitangents = NULL;
mAnimMeshes = NULL;

for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; a++)
{
mNumUVComponents[a] = 0;
Expand Down Expand Up @@ -642,11 +649,12 @@ struct aiMesh
}
delete [] mBones;
}

if (mNumAnimMeshes && mAnimMeshes) {
for( unsigned int a = 0; a < mNumAnimMeshes; a++) {
delete mAnimMeshes[a];
}
delete [] mBones;
delete [] mAnimMeshes;
}

delete [] mFaces;
Expand Down
6 changes: 6 additions & 0 deletions samples/README
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ SimpleTexturedOpenGL
See http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3736373


SimpleAssimpViewX

A Mac OSX-based viewer app. This sample was kindly provided by drparallax.
See http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829


29 changes: 29 additions & 0 deletions samples/SimpleAssimpViewX/English.lproj/Credits.rtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw9840\paperh8400
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\f0\b\fs24 \cf0 Engineering:
\b0 \
Some people\
\

\b Human Interface Design:
\b0 \
Some other people\
\

\b Testing:
\b0 \
Hopefully not nobody\
\

\b Documentation:
\b0 \
Whoever\
\

\b With special thanks to:
\b0 \
Mom\
}
Binary file not shown.
Loading

0 comments on commit 6f1408a

Please sign in to comment.