Commit Graph

400 Commits (db2500c39341f8169ffd4fbd2e26cd4aee293437)

Author SHA1 Message Date
Marc-Antoine Lortie ab284f7996 Fixed enumeral mismatch error in build. 2020-01-26 14:02:16 -05:00
Marc-Antoine Lortie b23c0b0637 Uniformized error codes (return values) in assimp_cmd. 2020-01-26 13:10:21 -05:00
Marc-Antoine Lortie 770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Marc-Antoine Lortie 4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
Kim Kulling 40d882af4f fix irrreader leak. 2020-01-16 20:25:47 +01:00
Kim Kulling 13586eb073 remove the qt-viewer from the build system. 2019-09-21 18:02:37 +02:00
escherstair c4ce8cec96
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:02:56 +02:00
Gordon MacPherson fbb34b1de1 ScaleProcess overhauled to improve compatibility with animations and unit conversion.
./assimp Added arguments --gs to assimp command line option to enable global scaling.

No scaling for mScale of 1.0.

Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
Kim Kulling cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
Kim Kulling 85a7f46049
Merge branch 'master' into ParsePostProcessArgs 2019-05-29 00:03:09 +02:00
Rémi Verschelde 5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
Alexandre Avenel a60b7696e3 Parse post process arguments when using info tool 2019-05-21 19:39:49 +02:00
RichardTea b515f04ce6 assimp_view is ANSI (MBCS) only
It should really be ported to UNICODE at some point, however I do not have the DirectX9 SDK so cannot confirm whether such a port is working.
2019-04-17 10:48:14 +01:00
RichardTea 9242a12bf5 Qt5 requires cmake 3.1
Earlier versions are not supported
2019-04-17 09:32:59 +01:00
Charlie Gettys f15f37634d BlenderDNA.h:
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.

COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality

FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)

FBXConverter: Rename local variables to avoid shadowing parameter

ImageExtractor: Remove duplicated/unreachable code

FBXConverter: Another shadowed variable fix

MD5Loader: 2 shadowed variables

IRRLoader: shadowed parameter

StepFileReader.cpp: Shadowed parameter

IRRLoader: remove empty else statement

STLExporter: Throw error instead of silently ignoring unimplemented option

Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
kimkulling 61ffe017e8 Fix some coverity findings. 2019-03-14 17:37:28 +01:00
kkulling 0dc2e9197a Fix compiler warnings. 2019-03-13 14:40:02 +01:00
Kim Kulling ae41ae3211 closes https://github.com/assimp/assimp/issues/305': fix viewer 2019-02-18 21:43:45 +01:00
kimkulling 3f9a25df5a Devil: replace this by header-only lib. 2019-02-07 17:09:05 +01:00
Kim Kulling 1e35ea3bc8
Merge branch 'master' into sec_issues 2019-02-06 11:27:53 +01:00
Kim Kulling 6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +01:00
Kim Kulling afb779e59d remove dead code 2019-02-05 00:36:07 +01:00
Kim Kulling f5ef078834 fix openfiledialog in modelviewer. 2019-02-04 22:15:15 +01:00
kimkulling 4347ce4311 Some more findings. 2019-01-31 17:24:08 +01:00
kimkulling de02fb2129 Fix review findings. 2019-01-30 16:07:40 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Kim Kulling 194b59b3b2
Update Info.cpp
Add a simple check to avoid verbose + silent mode together,
2018-12-22 09:12:10 +01:00
Alexandre Avenel b71b7982b5 Add silent flag to assimp cmd
Add a new command line flag to assimp cmd in order to only display minimal
info when loading a file.

This is especially useful for quick profiling/fuzzing.
2018-12-15 18:07:34 +01:00
Martin Jerabek e8e8578d7f assimp_cmd: fix writing compressed binary assimp format
Also print someting to console when compression fails.
2018-11-26 12:06:08 +01:00
d 95c0deaaff added DropFaceNormals process 2018-10-29 16:23:11 +01:00
Alexandre Avenel b3e858956a Fix #2149 Add flag to embed textures in assimp_cmd 2018-09-21 22:17:12 +02:00
Kim Kulling 0ff4640dcd Remove qt4-support for viewer. 2018-08-19 21:27:08 +02:00
Kim Kulling fe6be58b35 Some cleanups. 2018-08-19 16:51:47 +02:00
Kim Kulling 5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +02:00
Kim Kulling e5fa1798f6 closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export. 2018-06-17 20:37:09 +02:00
Kim Kulling 3e45acbf4e
Merge branch 'master' into review 2018-06-16 09:10:41 +02:00
Cloud Wu 2188703f55 fix build for independent build dir 2018-06-13 10:46:30 +08:00
Kim Kulling a2a7877939
Merge branch 'master' into make_tools 2018-06-04 09:12:11 +02:00
Kim Kulling 339cc2e951 Some review findings. 2018-05-31 20:15:13 +02:00
smalcom f29af1abc0 [-] Trace print removed. 2018-05-25 21:31:22 +03:00
smalcom 67eff10d8f [*] qt_assimp_viewer can be built with Qt4 or Qt5.
[F] Working in doule precision.
2018-05-25 21:19:06 +03:00
smalcom f59ab5c34f [F] More correct control by a mouse 2018-05-24 17:11:21 +03:00
smalcom fd7f07068c [F] React on mouse pressing ig view only. 2018-05-24 13:05:50 +03:00
smalcom f56432f713 [F] One alignment for labels.
[-] Unused checkbox.
2018-05-24 13:04:39 +03:00
smalcom 6093769da1 [*] Refactoring of "draw axes" procedure.
[-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
2018-05-24 12:31:49 +03:00
smalcom 348b34a2de [F] Wrong type in equation. 2018-05-21 17:38:43 +03:00
Kim Kulling e75cc86375
Merge branch 'master' into qt-5.11 2018-05-18 14:58:45 +02:00
Andreas Sturmlechner 5bbf0a8afa Add missing assimp_qt_viewer install target 2018-05-16 14:02:54 +02:00
Andreas Sturmlechner 7251c3c51a Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone) 2018-05-16 14:02:54 +02:00
Kim Kulling 1b71c2fd34
Merge branch 'master' into assimpviewer_dev 2018-05-13 10:41:16 +02:00
Kim Kulling f7d0e05018 closes https://github.com/assimp/assimp/issues/1952: check for postprocessing parameter before try to parse -f 2018-05-10 14:21:43 +02:00
Kim Kulling a5a4da8900 Appveyor: adapt install script. 2018-05-10 09:19:53 +02:00
Kim Kulling d441dcd523 addmissing file. 2018-05-09 19:15:42 +02:00
kimkulling 60d803f490 Some minor fixes of typos and formatting issues. 2018-05-09 09:51:05 +02:00
Jean-Louis 5a5db25df6 Fix AssimpView build
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
2018-05-08 00:28:53 +02:00
Kim Kulling a9dcbedefb Make: save environment during make. 2018-05-07 22:07:19 +02:00
Kim Kulling ce11aa51f5 add win32-based make script. 2018-05-07 00:07:41 +02:00
kimkulling 8626b185fb Fix misused log macros + compiler warnings. 2018-04-26 16:38:42 +02:00
James Carthew 8cb25328cb committing all changes. 2018-04-05 17:50:30 +10:00
James Carthew 4254142575 Updated GLView to draw with white lighting after drawCoordSystem(). 2018-04-05 06:37:18 +10:00
Tommy 4a4b9cd31b assimp_cmd: prettier and better-compressed node hierarchy.
Also removed line and nesting limits.
It's better to show all the info than to silently discard some.
With the new compressed display, it is far less obtrusive anyway.
2018-03-29 12:59:35 +02:00
Kim Kulling 145a09a775
Merge branch 'master' into info_more_mesh_info 2018-02-28 21:38:52 +01:00
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
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