Commit Graph

8455 Commits (d276044ad3a874948e4ad556747cc8d6ef22b36c)

Author SHA1 Message Date
aramis_acg 07c25b8ef9 Fresh icon for assimp_cmd on Windows.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@583 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-04 18:34:40 +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 b2aeba2b10 Fixed out-of-source builds of assimp_cmd.
Removed sample comments from the assimp_cmd CMake script and adapted it to the style used in the other CMake files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@580 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:55:54 +00:00
klickverbot 9343c3b28f Only use bin/ and lib/ as output directories if doing an in-source build.
This prevents littering the source tree if the user does not want to.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@579 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:55:02 +00:00
klickverbot ed41aa8ce1 Renamed CMake project to Assimp, as the semi-full name »AssetImporter« was used nowhere else.
Sorry, kimmi, if this was on purpose – feel free to revert.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@578 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:07:59 +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 ee6c6e5187 CMake cleanup, part one (sorry for the large commit).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@576 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 21:46:56 +00:00
jonathanklein 31febb2c21 - improved documentation for ogre loader
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@575 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 16:08:27 +00:00
jonathanklein df9a4bf66c - New Ogre testmodel inclusive blend File
- Changed axes for location keys

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@574 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 15:50:32 +00:00
rave3d bdcbdc3080 Adding forgotten AssemblyInfo.cs
Removing obsolente PreBuildStep

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@573 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 15:27:48 +00:00
aramis_acg 874fe086bb Remove SWIG_WIP folder.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@572 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 14:16:13 +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 98bac7094b Resolve GCC warnings in assimp_cmd
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@570 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 21:45:28 +00:00
aramis_acg f7aa189118 Add assimp command line tools to CMAKE build. Add it to make install as well. Needs more testing on different systems.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@568 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 19:27:36 +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 8ef1e5b4ba Add README to PyAssimp. Mention install procedure and give a basic usage sample.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@566 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 15:15:09 +00:00
aramis_acg 9d2eacfdb2 Fix call to assimp.aiReleaseImport(), scene pointer was passed in incorrectly
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@565 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 14:49:35 +00:00
aramis_acg cc489f30e7 Change pyAssimps library detection routine to work on Linux as well
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@564 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 13:48:17 +00:00
aramis_acg 93ed38e50b FIX: Change call to OutputDebugString to OutputDebugStringA to deal with _UNICODE builds.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@563 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 11:54:41 +00:00
aramis_acg 7c2d2a5c8c Add note on new cmake build tool to INSTALL
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@562 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-01 23:45:07 +00:00
rave3d ba4ca61dbd Adding first SWIG generated version of Assimp.NET
NOT REALLY TESTED YET

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@561 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-01 20:57:09 +00:00
rave3d 2a540119c5 Removing Old Assimp.NET folder in order to relace by a SWIG generated version
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@560 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-01 20:53:37 +00:00
aramis_acg df13041f42 Remove randomness from SceneCombiner.
This offers two advantages: firstly, boost::random isn't used by Assimp at all with these changes. Secondly, the results of the IRR/LWS loaders are guaranteed to be identical on each run now. That's crucial of course, I just failed to recognize it in the past.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@559 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-28 01:28:00 +00:00
kimmi 78f27eef13 BUGFIX : Fix incorrect INSTALL target.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@558 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-27 14:04:14 +00:00
kimmi e8675dba75 - UPDATE : Add klickverbot to CREDITS file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@557 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-27 12:14:04 +00:00
kimmi 7050ae5a3d - UPDATE : Add Install target to CMake build.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@556 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-27 12:00:00 +00:00
ulfjorensen 3e529ac1fc Bugfix: Collada animation parser now handles multi-value data types correctly. Or at least I hope so.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@555 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-26 15:17:19 +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 722dc4a9c2 Fix PyAssimp complaining on 'builtin_function_or_method' object has no attribute '_init'. Thanks to pekuja for the patch!
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@552 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-25 20:11:57 +00:00
aramis_acg 11e666fb90 Remove current jAssimp port branch. Will be rewritten using SWIG, the previous attempt is unmaintainable.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@551 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-24 22:45:29 +00:00
aramis_acg 53100645a2 FIX missing space screwing up doxygen tags on install page.
Rebuild chm-docs.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@550 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-22 20:30:59 +00:00
ulfjorensen 993ca25cdb Bugfix: fixed rather stupid typo in Collada anim keyframe interpolation
Bugfix: Collada Loader now respects skin controller bind shape matrix

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@549 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-22 18:06:50 +00:00
aramis_acg 4f6acc817e Remove some headers from AssimpSwigPort.i.
Get rid of scratch swig.i.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@548 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-21 21:36:09 +00:00
klickverbot 552c64bf4d [D] Use non-templated loading code to slightly reduce binary size.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@547 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-16 21:23:12 +00:00
rave3d 52228add3a add some #ifdefs for SWIG
fixed a compile error in DefaultIOSystem
add swig-script


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@546 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-15 18:28:32 +00:00
aramis_acg fc47576da5 Add WIP swig wrapper definition file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@545 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-15 15:38:45 +00:00
klickverbot de9a56b245 [D] Completely bind the C API now that the aiGetMaterialProperty issue is resolved.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@544 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-15 13:34:54 +00:00
aramis_acg 5355156b43 FIX: aiGetMaterialProperty is now exported properly
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@543 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-14 13:26:48 +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 17326515d4 Get rid of warnings on GCC4.4 with -wall
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@541 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-06 23:52:41 +00:00
aramis_acg 7dcbff5d5c Adding overloads for unsigned integer types to ByteSwap and StreamReader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@540 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-06 13:15:35 +00:00
aramis_acg 1fd3cfd311 MSVC: Add noreturn attribute to aiAssert and ValidateDSProcess::ReportError. This reduces warnings in VS2010's static code analysis tool. Thanks to Chris Maiwald for the patch.
Correct include order in assimp_view.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@539 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-05 22:32:19 +00:00
kimmi ea3cdcd843 BUGFIX : Fix make
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@538 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-04 19:04:21 +00:00
kimmi 08f18ec0fb - UPDATE : BAse makefile now provides an install target. Use like make install. The sdk will be installed to /usr/bin/assimp.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@537 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-03 21:49:34 +00:00
kimmi 61746a1efb UPDATE : Add Stepan Hrbek to the CREDITS for a bugfix in the material loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@536 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-02 19:56:48 +00:00
kimmi 21f948288c BUGFIX : Fix crash in material loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@535 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-02 19:54:37 +00:00
kimmi 5c0432057a - REFACTORING : Removing deprecated code from obj-loader.
- BUGFIX      : Fix memory leak in obj-loader, when an empty mesh was detected and ignored.
- BUGFIX      : Fix invalid material assignment in obj-loader, when groups are used instead of objects. 


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@534 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-01-31 16:53:08 +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