v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
858 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

177 Commits (4a88e50aa4d3a58862833d1b3948538bbdbcbc79)

Author SHA1 Message Date
ulfjorensen 3a4651b0ec Bugfix: SplitByBoneCountProcess sometimes split too early 
Export API continued.
First version of the Collada Exporter added. Handles static geometry and node hierarchy upto now. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@894 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-01-21 15:37:00 +00:00
aramis_acg e5f7fe0c3a - More work on the current draft of the export interface. Again, please comment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@886 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-01-05 22:07:51 +00:00
ulfjorensen ae23c03bd9 First proposal of the Assimp export API. Please comment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@885 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-01-05 15:33:01 +00:00
ulfjorensen a9e96e2f9b - added a new post processing step to split up meshes into submeshes with a limited number of bones. 
- fixed some wording details

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@864 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-22 18:14:51 +00:00
aramis_acg a453a0f69e - bugfix: In the vc9-x64-debug configuration, assimp_cmd was set to Win32. 
- inno setup: use silent install mode for msvc runtime redistributables.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@862 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 20:35:26 +00:00
aramis_acg 24aaedb9fd - remove vc8 workspaces from trunk. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@860 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 20:06:25 +00:00
aramis_acg 51fbb630e7 - fix vc9's debug-x64 build config. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@853 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-21 18:36:21 +00:00
aramis_acg 6f1408a7f0 - update CHANGES.current. 
- 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
 2010-11-21 14:57:00 +00:00
aramis_acg 8a336e8876 - Update build for xcode - parallel and universal, plus PCH. Update XCode project to reflect current state of the tree (thanks to Jørgen P. Tjernø for the patch) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@834 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-11-02 18:19:49 +00:00
aramis_acg fdda697af7 Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly. 
Update note in LICENSE accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-13 17:57:06 +00:00
ulfjorensen f601309db5 - anonym XFile materials are named now, to prevent them from being merged somehow 
- added another boost dependency - lexical_cast - and a little replacement for all those boost haters out there

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@826 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-08 17:27:59 +00:00
aramis_acg bd4a4fd608 further work on http://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632 - first try the old node resolving algorithm (which checks for node IDs), if this fails switch to a workaround which takes both node names and IDs into account. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@815 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-13 14:40:25 +00:00
aramis_acg 693a3a039d BlenderLoader: don't output diffuse color if it is all black. Seems to be Blenders way of telling us there is no diffuse color. 
AssimpView: add 'no transparency' option in UI and implement underlying logic.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@811 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-31 17:24:04 +00:00
aramis_acg 631f3a2ff9 assimp_cmd: make sure we define both DEBUG and _DEBUG in debug builds. This fixes build trouble with vc9-debug. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@809 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-31 02:39:00 +00:00
aramis_acg c5c5338397 Add first version of the planned progress feedback API to the public Cpp API. Currently, progress reporting is done between each major import stage. 
Fix various issues with the vc9 solution and assimp_cmd.
Declare some more Importer methods const. This marks them as safe to use from within a progress callback.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@806 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-26 18:16:12 +00:00
aramis_acg 20cc623ecd noboost: Add working implementation for boost.format to get proper Collada error messages. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3820367. 
Add unit test for this.

Fix build errors due to invalid pch settings in vc9 | release-noboost.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@798 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-23 17:49:03 +00:00
aramis_acg bcafa25012 Add missing zlib files to assimp_cmd's vc9 solution. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@795 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-23 15:16:18 +00:00
aramis_acg 81bebcd0ec Add basic support for the IZWARE NENDO file format (extension: ndo). The loader has been tested with files in format version 1.0, 1.1 and 1.2. Materials and textures are read but ignored for now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@791 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-09 08:24:16 +00:00
aramis_acg a9fd02c14e JoinIdenticalVertices: Performance optimizations by Krishty („Fuck the System”). Yields a 9x speedup in first benchmarks with meshes > 2k triangles. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@780 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-11 23:07:11 +00:00
aramis_acg aae8637666 Add GLOB_MEASURE_TIME configuration option to profile the runtime of the postprocessing steps. 
Start new documentation page for Performance/Profiling questions.
Migrate existing notes on multithreading to a new doc page, add more details.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@772 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-08 22:44:44 +00:00
aramis_acg d082330cea BLENDER: Fix potential stack overflow caused by a DOM object referencing itself. 
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-07 14:50:19 +00:00
aramis_acg 393a08943b Deprecate vc8 workspaces. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@762 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-07 14:40:30 +00:00
aramis_acg 9f951857de Fix non-standard use of friend in tuple replacement. https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3735078 
Disable PCH for unzip files now for the whole build matrix.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@758 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-24 10:49:39 +00:00
aramis_acg 3cf930c591 Update vc8 project files. 
Manually update the revision number (haven't we talked about a better solution??).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@757 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-24 10:37:16 +00:00
ulfjorensen 3adce87c5c - Made it mostly compile again 
- Updated VC9 project files

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@756 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-21 17:28:02 +00:00
adario c96b831be5 Fixed build issue on Mac OS X. 
The Xcode projects have been updated to the latest revision of the trunk; they appear to build fine now.  As usual, Xcode 3.0 or later is required to build the projects.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@740 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-26 02:32:09 +00:00
rave3d 6079125444 some fixes in assimp.net 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@724 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-13 17:08:35 +00:00
aramis_acg 32bfa9ac21 Add WIP version of the BLENDER importer. DO NOT USE FOR PRODUCTION YET! 
Loads static meshes. Sometimes (it segfaults on the rest). No materials, cameras, fancy stuff. Works with all versions of blender. No compressed blend files yet.

- StreamReader now uses shared_ptr's to manage ownership of the stream.
- Adapt other loaders accordingly.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@717 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 10:22:24 +00:00
aramis_acg 5bcde55c18 FIX: assimpview now builds fine with noboost targets / vc8. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@674 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-12 23:54:17 +00:00
aramis_acg 4f50c04347 Add shared_array to vc8 solution. 
Fix shared_xxx::operator=.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@669 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-11 02:52:27 +00:00
aramis_acg 33544456cd Assimp-cmd now compiles fine using vc9 with a noboost target. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@665 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-11 01:54:46 +00:00
aramis_acg 01a25c1fb4 Get rid of ./extra folder in ./code. Move contents to main code folder. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@664 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-11 01:41:24 +00:00
aramis_acg 11f5a3cec5 vc8: Fix debug-x64 output&intermediate directories. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@647 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-05 00:26:45 +00:00
aramis_acg 4c1b5a532d Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported. 
Add some fast_atof overloads to simplify calling it.
Add another convenience c'tor to aiColorMM.
Add COB test models.
Remove unreferenced member in B3D importer.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@633 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-02 04:17:05 +00:00
jonathanklein 25416b494f further work at Ogre Importer: 
- split some code to OgreImporterMaterial.cpp
- Animation keys now are absolute, like required
- WorldToBoneSpace is now BoneToWorldSpace (hence we compute the inverse and the variable is renamed)

Animations still don't work really, so this version has basically no new features

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@621 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-19 20:45:40 +00:00
aramis_acg 762a7df46a Revamp exception handling. ImportErrorException renamed to DeadlyImportError to avoid silent regressions. Exceptions now thrown by value, and caught by reference. Put guards in all C++ and C API functions to avoid unwanted exception propagation across module and language boundaries. 
PLEASE TEST CAREFULLY IF THIS SHOULD CAUSE REGRESSIONS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@617 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-18 17:00:12 +00:00
klickverbot de9b7a52f9 Added missing files to the XCode project; define AI_BUILD_BIG_ENDIAN when compiling for Apple/PowerPC. 
Again, thanks to Dario Accornero for the patch!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@587 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-05 18:02:36 +00:00
aramis_acg 26a96340ff - Add 'info' utility to assimp_cmd. It displays quick file statistics, texture dependencies, file structure. 
- Clean up assimp_cmd source code, a bit of doc work as well.
- Remove unused workspaces pertaining to old jAssimp and Assimp.net.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@582 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-04 17:47:39 +00:00
klickverbot 2b7bc324f8 Added noboost targets to the XCode project file. 
Thanks to Dario Accornero for the patch!

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@581 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 23:07:19 +00:00
klickverbot ac8479f542 Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …). 
Please be quick to suspect this commit if the build should break on Windows/MSVC.

(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 21:48:23 +00:00
klickverbot 3cd5e2a889 Removed obsolete SCons workspace. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@571 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 14:05:09 +00:00
aramis_acg 5738860990 - Change BaseImporter::GetExtensionList to add all known file extensions to a std::set, so uniqueness is guaranteed. Also rewrite all related functions in Importer. NOTE: This does *not* change the public interface. 
- FIX build error on vc8/release-noboost x64, ConvertUTF.c had wrong PCH settings.
- ADD knowext and listext verbs to assimp_cmd, add some raw docs.
- Update unit tests to reflect these changes. Currently I keep getting failures in some tests, this needs to be resolved *urgently*.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@567 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-02 17:38:01 +00:00
aramis_acg b536a22e4e FIX vc8/PostBuildEvent: Enclose arguments to mkdir with double quotes to deal with spaces in paths. Thanks to Jonathan Klein to point it out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@554 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-25 21:32:43 +00:00
aramis_acg 7c16f41c21 FIX vc9/PostBuildEvent: Enclose arguments to mkdir with double quotes to deal with spaces. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@553 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-25 21:20:11 +00:00
aramis_acg 707b06a7fe Add experimental MS3D loader, static meshes only at the moment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@542 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-02-07 00:54:48 +00:00
aramis_acg c55be8ada3 FIX: Cleaning up use of printf() format specifiers. %i mostly replaced by %u when appropriate. 
FIX: 'size_t to %i' printf() vulnerability. 
FIX: Subdivision, change line&point handling, add missing parentheses to clarify order.
Add missing headers to vc9 workspace.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@533 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-28 23:01:33 +00:00
aramis_acg 2e3fee99f0 ADD Vertex utility class to simplify conversion from and to interleaved vertices. 
Refactor JoinVerticesProcess to utilize the new utility.
ADD basic operators for aiColor4D, move to dedicated header and implementation file.
ADD some utility functions to SpatialSort.
ADD my existing Catmull-Clark implementation to Assimp for all model formats with support for subdivision surfaces. Slightly WIP, likely to produce errors on non-closed meshes. Currently only implemented in the AC3D loader.
Switch to byteswap intrinsics instead of inline assembly (bswap). Currently MSVC only.
FIX phong shading in assimp_view.
VertexTriangleAdjacency class now also works on arbitrary polygons - UNTESTED, tbd.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@532 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-28 21:17:25 +00:00
aramis_acg def60805d3 Move info.txt for xcode workspace one folder up in the hierarchy. Otherwise, most users won't read it. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@527 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-01-13 15:30:11 +00:00
aramis_acg 1a4ef72ffb Add 'noboost=1' and 'shared=1' parameter to SConstruct. Update INSTALL AND README. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@513 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-14 18:32:06 +00:00
aramis_acg a9ece90b81 FIX: Scons workspace was missing a reference to contrib/ConvertUTF. 
FIX: assimp_cmd doesn't anymore execute ConvertToLeftHanded if only -fuv or -fwo is specified.
FIX: Amd64-Build with vc8 - invalid integer promotion
FIX: Remove '_asm int 3' debug stuff from IrrXML. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@512 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-12-14 17:17:41 +00:00