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
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