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

154 Commits (fe732134208c86d02fa64bd98f0767f2485b2e9f)

Author SHA1 Message Date
Tommy ce7673979b assimp_cmd export: print error message on failure. 2018-02-25 10:10:07 +01:00
Tommy e7736022c8 assimp_cmd info: list meshes and print basic mesh stats. 2018-02-25 09:34:14 +01:00
Tommy a8fc22fd3f assimp_cmd: Add --verbose flag to 'info' command, to print node transforms. 2018-02-21 12:57:45 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
BuildTools a8a1ca9894 header paths adjusted for unit tests and samples 2018-01-05 23:12:40 -08:00
Turo Lamminen 10f4b6f95c assimp_cmd: Fix strict-aliasing warnings 2017-11-18 16:02:53 +02:00
Turo Lamminen 9dadec7736 assimp_cmd: Add assertion to silence a static analyzer warning 2017-11-15 11:45:21 +02:00
Kim Kulling 919f2a1ea9 Commandline tool: fix url to project space. 2017-07-30 21:21:51 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Jared Mulconry dc3f265803 Fixed build warnings on MSVC14 x64 in the write dumb source. 2016-11-27 15:16:19 +11:00
Kim Kulling 8ba10cf26a Closes https://github.com/assimp/assimp/issues/966: add missing doc for 
assimp_cmd.
 2016-08-09 13:42:33 +02:00
Chris Russ fa1d6d8c55 propagating precision requirments into operations 2016-07-16 18:23:33 +10:00
Kim Kulling 97145a7f20 Replace std:.endl by backslash n. 2016-04-27 17:59:12 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
rmitton 957426ed72 Tiny misc fixes for documentation 2015-12-13 22:12:25 -08:00
IOhannes m zmölnig 989e8af3fb fix argument check for assimp cmdline tool 
`assimp cmpdump` expects two files as arguments.
so we need to check for at least 2 extra arguments (rather than only check
for !<1 and access both)
 2015-11-13 22:33:53 +01:00
Kim Kulling 36f0ccced1 Merge branch 'master' of https://github.com/assimp/assimp 
Conflicts:
	tools/assimp_cmd/ImageExtractor.cpp
 2015-07-08 00:40:35 +02:00
Kim Kulling bc8aa18eb2 Fix : https://github.com/assimp/assimp/issues/557 2015-07-08 00:34:28 +02:00
Alexander Gessler cf4cb6caef Merge pull request #598 from LegalizeAdulthood/cppcheck-null 
Fix char buffer issues found by cppcheck
 2015-07-05 13:46:54 +02:00
Richard dd609767f2 Fixed: Use proper printf format specifier for unsigned integers 2015-07-03 19:39:05 -06:00
Richard 8d82bf3338 Fixed: Ensure string buffers are NUL terminated. 2015-07-03 19:33:58 -06:00
Kim Kulling d763483c67 Merge pull request #596 from LegalizeAdulthood/init-variables 
Initialize all members in c'tors
 2015-07-03 15:36:58 +02:00
Richard b34b5d4207 Fixed: Plug FILE* resource leak 2015-07-02 20:55:56 -06:00
Richard c25690f0e4 Refactor: Use LF line endings for source files 2015-07-02 20:51:45 -06:00
Richard 5ae1c28881 Refactor: Apply editor config rules to tools 2015-06-29 20:54:59 -06:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Peter LaValle db8b973aec wrapped the CRT warning macro 
I already have these in an outer-script
 2015-05-31 11:52:04 +01:00
abma 8c45a4dc3b Merge remote-tracking branch 'origin' 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
 2015-04-16 01:03:00 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
Alexander Gessler e5d4f537bd CompareDump: do not use C++11 range based for loop. 2015-03-28 13:10:34 +01:00
Alexander Gessler ce7b3af1d7 CompareDump: fix typo in light compare code. 
Brings regression suite local runs to 100%.
 2015-03-28 12:53:08 +01:00
Alexander Gessler e2addcee77 CompareDump: fix reporting bugs. The top stack entry was missing (!) and we had an off-by-one in the index computation. 
Also, all of this should be rewritten from scratch.
 2015-03-28 12:51:46 +01:00
Alexander Gessler e0dd061dcb CompareDump: add debug trace of past push/pop operations to assist debugging. 2015-03-28 12:46:15 +01:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
Alexander Gessler 09c15331c4 Improve error reporting during dump diffing. 2015-03-15 21:01:34 +01:00
Kim Kulling d9d7dd31ea fix linker error: undefined references to openddl_parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-11 19:05:37 +01:00
Turo Lamminen 5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Kim Kulling b700cd917f Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable 
Fix exported library name variable
 2015-01-29 17:24:30 +01:00
Turo Lamminen b97c26b1d2 Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes 2015-01-25 22:30:10 +02:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX 
to have a consistent library name accross platforms.
 2015-01-23 14:19:29 -05:00
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler 247f5cee3a Assimp_cmd: Drop malformed version spec from rc file. 2014-06-14 22:47:18 +02:00
Léo Terziman e7e0a5a090 Fixed assimp_cmd version message 2014-05-19 14:56:39 +02:00
Kim Kulling f6925db3d8 update: add cmake_mimimum_required statement to each cmake file 
for consistency
 2014-05-10 10:31:42 +02:00
Kim Kulling 825a61fbc0 update: 
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-05-01 11:32:15 +02:00
Léo Terziman 2047cf6764 Merge remote-tracking branch 'official/master' into contrib 2014-04-28 09:11:40 +02:00
Peter LaValle 4d2c7f116d XML filename tweaks 
This change encodes the XML strings for scenarios involving `&` et al in material file names
 2014-04-22 16:33:11 +01:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
 2014-04-22 14:32:59 +02:00
Peter LaValle 73e6908c36 fixed "<Colors ...> ... </Color>" typo 
The XML tags did not match. Mismatched tags confuse XML parser kits. So I fixed the tags to match.
 2014-04-15 15:10:48 +01:00
Léo Terziman 9cc1e8fa1c Fixed assimp_cmp version output message 2014-01-17 12:03:10 +01:00
Alexander Gessler 69acdabdef CMake: make assimp_view/assimp_cmd's file copying DEPEND on assimp. 2013-09-18 14:42:42 +02:00
Alexander Gessler de03173e6d CMake: simplify. 2013-09-18 14:37:49 +02:00
Alexander Gessler f8f7e2468c CMake: use copy_if_different instead of copy and only run PRE_BUILD on Windows as it is not required on *nix anyway. 2013-09-18 14:10:26 +02:00
Alexander Gessler 995978b163 CMake for assimp_cmd: also copy over assimp output binary as PRE_BUILD event. 2013-09-18 13:55:02 +02:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
kimmi 71b8fa7cb5 Bugfix : Commit not saved changes. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1226 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 22:41:39 +00:00
jonathanklein eebba5348d - Added Debug Postfix 
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:55:47 +00:00
aramis_acg 6fa251c2f2 - unify naming of all header files. Obviously, this is a breaking change that affects all users. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 17:04:06 +00:00
aramis_acg f07901df9d - update tools/ 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1149 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 16:26:11 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 03:38:30 +00:00
aramis_acg afd462045d - assimp export: fix small issue when guessing output file format. See https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4922378 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1103 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-04 15:10:27 +00:00
kimmi 1a6f1cb3e1 Bugfix : Patch for the debian-builds: remove a g++ specific printf-format bug. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1081 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-28 08:30:44 +00:00
aramis_acg 2ffac898d6 [3393728] [PATCH 1/2] ommit->omit and splitted->split 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1064 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-20 22:00:33 +00:00
aramis_acg 9edc0a9b8e merge with git://github.com/tonttu/assimp.git 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-06-09 14:29:32 +00:00
aramis_acg c05acabea9 - update cmake build environment, now includes targets to build debian packages for Assimp. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-09 19:34:21 +00:00
aramis_acg 7807c15e65 # fix portability problem with the Hsieh hash, which I had introduced accidentially. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@964 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 17:14:21 +00:00
aramis_acg 07dd50c975 # fix a critical portability problem in the mini dump writer code (it still depends on the endianess, but no longer on integer size). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@963 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 17:11:54 +00:00
aramis_acg 2afda9c888 # more fixes on dump writing code. should now yield fully portable results. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@956 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 12:38:54 +00:00
aramis_acg 9491b0c044 # fix undefined behaviour in WriteDumb.cpp that would make our dumps include some padding bytes 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@955 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 12:21:49 +00:00
aramis_acg 6e74e066a2 # fix gcc compile errors 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@950 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-15 15:31:22 +00:00
aramis_acg 2b4126a7e3 - assimp_cmd: add Debone & SplitByBoneCount to thee list of supported pp steps. 
- assimp_cmd: fix code formatting
# duplicate some code from ProcessHelper.h, which was previously accessible but no isn't anymore due to recent refactoring in assimp's core.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@948 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-15 15:14:33 +00:00
aramis_acg d85c16b52f assimp_cmd: fix possible crash in assimp export if the file can be imported, cosmetic fixes. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@935 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 11:57:57 +00:00
aramis_acg f8add9bb22 -add missing unit to cmake script for assimp_cmd, fix linux build trouble. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@934 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 11:44:09 +00:00
aramis_acg eb4afe8f91 + Implement export utility into assimp_cmd. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@929 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 10:45:27 +00:00
aramis_acg 79eca6196d [3167364] -- is not allowed in XML comments, thus rendering assimp_cmd's output malformed in some cases. Subtitute -- by ?-. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@902 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-02-10 16:58:44 +00:00
aramis_acg 9d69165ae7 assimp_cmd now specifies the GLOB_MEASURE_TIME propery 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@781 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-11 23:26:30 +00:00
aramis_acg b9b4ea177b MS3D loader now uses aiMesh::mName to express the original group names from the MS3D file. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@729 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-20 12:19:05 +00:00
aramis_acg 7cea2eb497 Change date in license header to 2006-2010. This involves updating quite a few files, sorry. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-10 15:30:22 +00:00
aramis_acg 75c1cc3edd Fix version number in assimpcmd and assimpview. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@645 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-04 15:47:46 +00:00
aramis_acg c58dcee5b9 Add 'testbatchload' verb to assimp_cmd. It expects a list of input files and loads them all. This is intended to test reusability of a single importer. Not mentioned in doc. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@624 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-23 18:16:22 +00:00
aramis_acg ff53e84749 - Update XML output written by assimp dump. cameras & lights missing, document scheme as well. No guarantees that I won't change it in future without further notice (currently WIP, format to be freezed with our next release). 
- Add dump comparison tool to assimp_cmd. It serves as the workhorse of the regression suite.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@598 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-13 00:04:21 +00:00
aramis_acg b26cee19a0 assimp info now prints min,max and center points of a model. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@586 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-04 21:09:51 +00:00
aramis_acg a7f298e6c3 - Move mkutil to packaging/windows-mkzip. Any further scripts to build dedicated download packages from a SVN working copy should go into packaging/<x> from now. 
- Migrate mkutil/revision.h to the root folder, adjust all dependent paths.
- Get rid of unneeded win batch scripts.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@584 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-04 18:46:54 +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 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 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
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 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
kimmi 82bb2313f0 - Add cmake buildfile for unitests ( currently no cppunit is part of the makefile ). 
- Add cmake buildfile for assimp_cmd application.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@463 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 20:53:30 +00:00
aramis_acg c50410f487 FIX: Dump contains material index now. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@447 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-06-29 14:58:06 +00:00
aramis_acg d881a16402 Logging functions are now available to C-Users, too. Cleaning up headers. 
Changing spelling of some enums to camel.
Ply loader loads tristrips correctly now.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@425 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-28 11:32:54 +00:00
aramis_acg 9abcba4bc2 Integrating aiProcess_OptimizeGraph and aiProcess_OptimizeMeshes back into the Assimp core. They're stable enough now. 
Moving private members of Assimp::Importer to a pimpl, hopefully solving strange crashes with vc9 debug builds.
Updating assimp_cmd to reflect these changes.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@403 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-24 20:53:24 +00:00
aramis_acg bd196ea318 - Changing LWO loader's VMAP selection strategy. Unassigned VMAPs (UVs and VColors) are now kept, if possible. Referenced VMAPs have higher priority so everything should be backward compatible. 
- assimp_cmd writes vertex colors in 'Colors' elements now.
- assimp_cmd writes 'set=' attribute for UVs and vertex colors.
- Adding test files for the awesome new LWO capabilities.


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@396 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-20 16:49:46 +00:00