Commit Graph

435 Commits (d1e41aef21ca945019feaf5d2628cdfb72844ba2)

Author SHA1 Message Date
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling ebaa8be106 fix findings. 2018-01-23 13:02:13 +01:00
Kim Kulling 98c053a9b9 Fix textures 2018-01-23 13:02:03 +01:00
BuildTools 6a76959f5b "s, <s, and >s oh my... 2018-01-06 21:20:45 -08:00
BuildTools 0c4c66be50 I assume too much about header paths... 2018-01-06 21:00:11 -08:00
BuildTools 123fb1d009 ../../code header path oversight fixed 2018-01-06 20:50:01 -08:00
BuildTools a8a1ca9894 header paths adjusted for unit tests and samples 2018-01-05 23:12:40 -08:00
Jean-Louis Boudrand 04d5f49f6d Use QString::number
easier to read + typos
2017-12-28 15:10:55 +01:00
Jean-Louis Boudrand e030d374b9 Qt Viewer : Fixes for failed imports
Fix the UI when an import fail
2017-12-28 13:55:41 +01:00
Jean-Louis Boudrand e5891e5a09 Qt viewer : Improve exports
- Add a dialog to select the exporter
- Export based on exporter id instead of extensions (fix issues like for Collada)
- Message box if there is an error
2017-12-27 19:08:20 +01: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
Unknown 12dbbd4ce9 Misc. typos
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Jared Mulconry 059a32654e Addressed warnings generated on MSVC across x86 and x64. 2017-09-24 19:29:43 +10:00
THISISAGOODNAME 1e3a9ded11 Fix assimp_qt_viewer build failed on OSX 2017-08-30 23:18:36 +08:00
Kim Kulling dab0985994 assert: remove assert with more than one statement and use only ai_assert. 2017-08-14 22:20:26 +02:00
Kim Kulling 919f2a1ea9 Commandline tool: fix url to project space. 2017-07-30 21:21:51 +02:00
Kim Kulling 9d69a12532 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-01 16:22:25 +02:00
Kim Kulling cab6cdf7b2 Viewer: fix the build. 2017-06-01 16:21:23 +02:00
Kim Kulling febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Andy Maloney b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
aoowweenn ba357e74d2 fix the exporter of the qt viewer 2017-03-08 21:13:54 +08:00
aoowweenn 4045466f73 pass through but panic 2017-02-24 08:35:15 +08:00
Jared Mulconry dc3f265803 Fixed build warnings on MSVC14 x64 in the write dumb source. 2016-11-27 15:16:19 +11:00
Jared Mulconry f206249fbf Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
# Conflicts:
#	code/AMFImporter_Postprocess.cpp
#	code/FBXConverter.cpp
#	code/IFCLoader.cpp
#	code/NDOLoader.cpp
#	code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
Kim Kulling e50ac81b65 Merge branch 'master' into coverity_scan 2016-11-21 18:57:56 +01:00
Jared Mulconry 745f754310 Fixed build warnings on MSVC14 x64 in the Message Proc source. 2016-11-20 12:04:50 +11:00
Kim Kulling 67febc41c6 QtViewer: some refactorings. 2016-11-08 14:53:52 +01:00
Kim Kulling 79504c08d9 QtViewer: fix review findings. 2016-10-22 22:14:01 +02:00
Kim Kulling 3b61ff4cf2 Qt5-based Viewer: fix build. 2016-10-21 12:50:41 +02:00
Alexandr Arutjunov d63bff707e [+] Embedded uncompressed textures support.
[F] Orphaned textures ID issue.
2016-09-29 17:15:21 +03:00
Kim Kulling f51cd4c6d4 Merge branch 'master' into coverity_scan 2016-09-12 12:42:11 +02:00
Kim Kulling 7cedd4ab89 CMake: fix buildCMake: fix build.. 2016-09-10 08:48:01 +02:00
Kim Kulling 91f24db739 Merge branch 'master' into coverity_scan 2016-09-02 10:25:36 +02:00
Kim Kulling 243df452a4 GeometryBuilder: fix update of vertices. 2016-08-25 18:20:52 +02: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
Alexandr Arutjunov 2a815df888 [F] Texture coordinate Y must be flipped for OpenGL. 2016-08-01 13:13:35 +03:00
Alexandr Arutjunov 28c0109b41 [F] Added include dirs and libraries for OpenGL and DevIL. 2016-07-31 15:50:48 +03:00
Alexandr Arutjunov 7df5e48129 [F] DevIL is needed for compilation. 2016-07-31 15:14:49 +03:00
Alexandr Arutjunov 2d921316ca [+] 3D viewer which uses Assimp and Qt4. 2016-07-31 14:56:30 +03:00
Kim Kulling 86b7f12c18 Merge branch 'master' of https://github.com/assimp/assimp 2016-07-22 21:16:34 +02:00
Kim Kulling bfed4ea634 Fix license date + remove deprecated macros. 2016-07-22 21:15:37 +02:00
Kim Kulling c471d8187f AssimpViewer: add assimp_viewer.h to CMakeLists.txt 2016-07-22 21:14:58 +02:00
Kim Kulling e3dcbcc766 Merge branch 'master' into coverity_scan 2016-07-16 11:38:27 +02:00
Chris Russ fa1d6d8c55 propagating precision requirments into operations 2016-07-16 18:23:33 +10:00
Kim Kulling e64f2e5efe Merge branch 'master' into coverity_scan 2016-05-13 14:28:11 +02:00
Kim Kulling 97145a7f20 Replace std:.endl by backslash n. 2016-04-27 17:59:12 +02:00
Kim Kulling 388694e349 cmake build env: add missing license info. 2016-04-23 09:42:27 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mensinda dd1ab0778c Fixed AnimEvaluator.cpp 2016-04-06 17:28:09 +02:00
mensinda cc0fce8568 Replaced boost::timer with std::chrono 2016-04-06 10:13:02 +02:00
mensinda ae99f99b99 Replaced boost::tuple with std::tuple 2016-04-06 00:17:21 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling 6cf639956a Merge branch 'master' into coverity_scan 2016-02-26 12:29:21 +01:00
Kim Kulling df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
Kim Kulling 96169560cc Merge branch 'master' into coverity_scan 2016-01-07 14:13:28 +01:00
Kim Kulling d43a083dc1 snprintf replacement: fix usage of ai_snprintf when snprintf is available. 2016-01-06 19:25:35 +01:00
Kim Kulling fb123ab1b2 trigger build. 2015-12-30 12:28:51 +01:00
Kim Kulling d7602930c0 coverity: add modeling file. 2015-12-29 20:45:02 +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
Kim Kulling 931cb7da71 Merge pull request #599 from LegalizeAdulthood/cppcheck-printf
Fixed: Use %u for unsigned int, not %i in printf
2015-07-04 09:51:04 +02:00
Kim Kulling 68f88752b3 Build: fix missing commas. 2015-07-04 09:22:11 +02:00
Richard dd609767f2 Fixed: Use proper printf format specifier for unsigned integers 2015-07-03 19:39:05 -06:00
Richard b6cf553ff5 Fixed: Use correct printf format specifier for unsigned integers 2015-07-03 19:38:59 -06:00
Richard e3ebef0094 Fixed: Correct null pointer dereference 2015-07-03 19:33:58 -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 c331df69d7 Fixed: Initialize all members in MeshHelper 2015-07-02 20:51:46 -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
Léo Terziman 825a58803d Removed some warning about const char* used as char* (not our choice, it depends of some external API) 2015-04-28 17:30:15 +02:00
Léo Terziman d809ca98c1 Fixed compilation issues with mingw 2015-04-28 15:16:53 +02:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer .
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02: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 cc32eda226 assimp_view: fix crash when trying to export while no model is loaded. 2014-07-22 20:35:09 +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
Léo Terziman 800f835f6f In AssimpViewer: verification + asserts on the variables in DoExport function to try to understand the stack corruption arround szFileName 2014-01-17 11:54:04 +01:00
Léo Terziman e6bbb512d7 In AssimpViewer: postprocess steps added to export to correct bugs in export (especially conversion from left to right handed) 2014-01-17 11:53:27 +01:00
Marcel Metz 6b5b3c64e6 Removed invalid extern keyword. 2013-11-20 14:42:23 +01:00
Marcel Metz c4d797ef58 Replaced function parameters with correct literals. 2013-11-20 14:42:23 +01:00
Marcel Metz 8d0b76a535 Added parenthesis for explicit operator evaluation priority. 2013-11-20 14:42:23 +01:00
Marcel Metz 9e579324d0 Added conditions for compiler oder build mode dependend code. 2013-11-20 14:42:23 +01:00
Marcel Metz c3852c4743 Removed noops and warnings on unused variables. 2013-11-20 14:42:18 +01:00
Marcel Metz c6297ec333 Fixed variable assignment values. 2013-11-20 14:40:25 +01:00
Marcel Metz 846a8959f8 Fixed class attribute initialization order. 2013-11-20 14:40:25 +01:00
Marcel Metz c1b28ff1ce Removed unreferenced variables. 2013-11-20 14:40:25 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +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
Alexander Gessler d45689a2c1 CMake for assimp_view: copy dlls from assimp build over to output folder. 2013-09-18 13:52:49 +02:00
Alexander Gessler 0b9d6bec0d - drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits. 2013-03-21 19:54:55 +01:00
acgessler aca543176d - more vc12 fixes 2013-01-20 04:00:34 +01:00
Alexander Gessler acdd0bfcb3 - fix animation selection combobox in assimpview. 2012-07-26 03:01:08 +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
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 23:14:39 +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
kimmi 1fef449654 Update : Remove secure warnings from assimp_view.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1173 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 12:43:48 +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
jonathanklein 6852eb6ffe - compiler error fixes for sample programs
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:53:58 +00:00
aramis_acg 23c16a3ef9 - assimpview: reuse textures to minimize memory usage. This may break editing stuff, but I'll fix this asap.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1168 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-16 00:05:47 +00:00
aramis_acg 745c1035bf - assimpview: do not create a new default texture each time we need one. Turns out memory is not unlimited.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1166 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-15 23:13:52 +00:00
aramis_acg 6f2ca1bb22 [3459159] Tidy up UI layout in assimp_view.
I changed the size slightly, but left the majority of the patch unchanged. Many thanks to Tor Andersson for the original patch! (see https://sourceforge.net/tracker/?func=detail&aid=3459159&group_id=226462&atid=1067634)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1155 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:50:01 +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 3f369342d6 - Redesign the C interface to allow per-import settings.
- Make C-API threadsafe even without boost (no longer a global importer <-> scene map).
- Cleanup headers.
- Change the way how Importer::pimpl is accessed - all users are no longer friends of Importer to avoid spoiling the public interface. Rather, pimpl is exposed via a public member function and anyone having the definition of ImporterPimpl can access it.

THIS IS A BREAKING API CHANGE for anyone using properties with the C API. It is, however, a huge step forward and finally makes our C API functionally equivalent to the C++ interface.

I hope we can adapt all ports as soon as possible. I'd be grateful if the respective maintainers could do this.

Documentation is not yet up to date.

All this is in anticipation to the upcoming 3.0 release, which I'm actively working on.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1111 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-13 14:07:58 +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
ulfjorensen 487071be77 Bugfix: FCollada's special texture tag "bump" now maps to aiTEXTURE_NORMAL. Thanks to agent8261 for the hint
Bugfix: AssimpView now properly skips the leading quotation mark when being executed with a file

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1078 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-14 09:41:48 +00:00
aramis_acg 9d85c8834d - extract MaterialHelper and move all of its members to aiMaterial in /include.
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:22:51 +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 56098cd33c # fix license headers on some of the AssimpView units. These claimed to be LGPLed, but in fact they are BSD as everything else.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1063 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 12:58:12 +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 1ac640f08b # fix small layout issue in assimpview
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@967 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 20:03:26 +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 9d0d06d637 - assimp_view: add support for Debone pp step.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@949 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-15 15:15:06 +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 2e2cb8ea79 # fix crash when attempting to export without having a model loaded.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@941 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 18:42:03 +00:00
aramis_acg 45d6647ffe + implement export support into AssimpView
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@937 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 14:25:18 +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 e6c0dbd35c - rework AssimpView GUI.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@933 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:35:19 +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
kimmi 071b786cd2 - BUGFIX : Make usage of export API in assimp viewer optional.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@918 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-15 20:27:18 +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
kimmi 45fca4b005 BUGFIX : Fix compile error on SunOS xentros 5.11: symbol conflict.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@896 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-23 22:49:02 +00:00
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 76a733e2f4 - fix _DEBUG/DEBUG inconsistencies in favour of _DEBUG. Thanks to Carsten Fuchs to point it out!
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@869 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-26 11:30:25 +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
kimmi 0fd0f68b26 UPDATE: Add opengl-samples to cmake build enviroment for windows systems.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@823 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-03 12:08:21 +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 400086e19f Fix possible data corruption in AssimpView (see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3831953). Thanks to mick-p to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@810 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-31 03:25:12 +00:00
aramis_acg a9fd7651fa Print version line to log upon loading a new file. This should aid at debugging incoming bugreports with logs attached.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@804 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 14:20:28 +00:00
aramis_acg 827b00226e Fix 3029892: assimpview crashes if the animation slider is touched while no asset is loaded.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@786 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-18 21:16:40 +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 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 6fa8c85f26 assimpview: fix typo in "about" dialog.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@753 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-07 16:05:56 +00:00
aramis_acg 7d1af07935 assimpview: reduce verbosity of output.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@738 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:31:53 +00:00
aramis_acg 2a6b4d1d17 assimpview: layout fixes.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@734 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 23:09:19 +00:00
aramis_acg 3cf20b605d blender loader now loads material assignments.
blender loader no longer produces randomized output in some scenarious. nice side effect of less asthetic diversity: less segfaults.
assimpview is no longer topmost.



git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@732 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 22:39:31 +00:00
aramis_acg c29e985f12 AssimpView now displays meshes and mroe detailled statistics in the scene browser.
Improve the user interface. takes more screen space now, but provides more information and less clumsy buttons.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@731 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-21 20:04:45 +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 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 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 1d595e14ad AssimpView-Build: SVNRevision is no longer doubly defined and the corresponding warning is gone.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@660 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:07:00 +00:00
aramis_acg bcf0ddc086 - don't delete the null logger.
- don't leak LogStreamInfo when detaching streams from DefaultLogger.
- detach the stream before deleting it in aiDetachAllLogStreams.
Thanks to Bart Botta for the patch.

- DefaultLogger does not properly delete log streams if they're still attached to it when the logger is destroyed. This is the behaviour specified in the documentation.
- Adapt AssimpView's logger usage, which didn't follow the spec as well.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@659 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-10 15:00:36 +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 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 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
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
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 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