Commit Graph

320 Commits (382f5fde5f9931790f115ad4261eaee28ec610e7)

Author SHA1 Message Date
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