c82f8c0b8f
Remove duplicated code
...
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:38:12 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
3510d85967
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-07 10:56:22 -04:00
a73fd6c84c
Update MessageProc.cpp
...
I guess Turol meant this change.
2020-04-04 18:24:19 +02:00
1b0a0675dc
Applied review requested changes - renamed _data to data.
2020-04-04 10:32:29 -04:00
1cb564aa4b
Fixed /W4 compile warnings in Assimp viewer.
2020-04-03 14:36:44 -04:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
69551e81ed
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 10:15:25 +01:00
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
957abaa15a
Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view.
...
This is a follow-up to PR #3024 , in which I explained that I would then change the version of CMake to 3.0 in several files to match the changes that were originally made by OP in PR #3008 .
The minimum CMake version have been raised to 3.0 in both assimp_cmd and assimp_view projects.
The same CMake configuration as in PR #3024 was used. All projects from PR #3024 are found in the solution with the current changes. All projects built. All tests were run.
2020-02-26 08:00:49 -05:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
be4fe131d5
Made changes to write compiled binaries to a common directory.
...
The following changes were tested with the following projects:
- assimp DLL
- unit tests
- tools/assimp_cmd
- tools/assimp viewer
- samples/SimpleOpenGL
- samples/SimpleTexturedDirectx11
- samples/SimpleTexturedOpenGL
For each program listed above, the results were tested when (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) is true and false.
Also, the "lib" in SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") was changed to "bin" to allow DLLs to be written to executables/launchables programs directory.
2020-02-15 13:10:11 -05:00
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
2c1c1d846e
Renamed WriteDumb.cpp to WriteDump.cpp
...
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
ff168d7bc0
Refactored Assxml exporter and dump xml writer.
...
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
2020-01-29 13:44:51 -05:00
5f30d4c0f8
Added missing cmd writting.
2020-01-28 12:30:09 -05:00
a328c18286
Fixed "printf format not a literal error" in build.
2020-01-28 11:06:17 -05:00
21edb13ff8
Added missing header for unique_ptr.
2020-01-28 10:55:22 -05:00
20388d6a4f
Refactored Assbin exporter and assimp_cmd binary serialization functions.
...
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
ab284f7996
Fixed enumeral mismatch error in build.
2020-01-26 14:02:16 -05:00
b23c0b0637
Uniformized error codes (return values) in assimp_cmd.
2020-01-26 13:10:21 -05:00
770c822621
Updated places to achFormatHint referencing array size.
2020-01-23 15:26:49 -05:00
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
40d882af4f
fix irrreader leak.
2020-01-16 20:25:47 +01:00
13586eb073
remove the qt-viewer from the build system.
2019-09-21 18:02:37 +02:00
c4ce8cec96
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:02:56 +02:00
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
cc10967913
Fix the build.
2019-06-11 20:17:50 +02:00
85a7f46049
Merge branch 'master' into ParsePostProcessArgs
2019-05-29 00:03:09 +02:00
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
a60b7696e3
Parse post process arguments when using info tool
2019-05-21 19:39:49 +02:00
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
9242a12bf5
Qt5 requires cmake 3.1
...
Earlier versions are not supported
2019-04-17 09:32:59 +01:00
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
61ffe017e8
Fix some coverity findings.
2019-03-14 17:37:28 +01:00
0dc2e9197a
Fix compiler warnings.
2019-03-13 14:40:02 +01:00
ae41ae3211
closes https://github.com/assimp/assimp/issues/305 ': fix viewer
2019-02-18 21:43:45 +01:00
3f9a25df5a
Devil: replace this by header-only lib.
2019-02-07 17:09:05 +01:00
1e35ea3bc8
Merge branch 'master' into sec_issues
2019-02-06 11:27:53 +01:00
6e39c22554
Fix potential security issues.
2019-02-05 22:05:52 +01:00
afb779e59d
remove dead code
2019-02-05 00:36:07 +01:00
f5ef078834
fix openfiledialog in modelviewer.
2019-02-04 22:15:15 +01:00
4347ce4311
Some more findings.
2019-01-31 17:24:08 +01:00
de02fb2129
Fix review findings.
2019-01-30 16:07:40 +01:00
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
194b59b3b2
Update Info.cpp
...
Add a simple check to avoid verbose + silent mode together,
2018-12-22 09:12:10 +01:00
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
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
95c0deaaff
added DropFaceNormals process
2018-10-29 16:23:11 +01:00
b3e858956a
Fix #2149 Add flag to embed textures in assimp_cmd
2018-09-21 22:17:12 +02:00
0ff4640dcd
Remove qt4-support for viewer.
2018-08-19 21:27:08 +02:00
fe6be58b35
Some cleanups.
2018-08-19 16:51:47 +02:00
5a23810d82
Introduce header-only imagelib to make install of qt-viewer simpler.
2018-08-18 11:07:12 +02:00
e5fa1798f6
closes https://github.com/assimp/assimp/issues/2019 : fix the qt-viewer without export.
2018-06-17 20:37:09 +02:00
3e45acbf4e
Merge branch 'master' into review
2018-06-16 09:10:41 +02:00
2188703f55
fix build for independent build dir
2018-06-13 10:46:30 +08:00
a2a7877939
Merge branch 'master' into make_tools
2018-06-04 09:12:11 +02:00
339cc2e951
Some review findings.
2018-05-31 20:15:13 +02:00
f29af1abc0
[-] Trace print removed.
2018-05-25 21:31:22 +03:00
67eff10d8f
[*] qt_assimp_viewer can be built with Qt4 or Qt5.
...
[F] Working in doule precision.
2018-05-25 21:19:06 +03:00
f59ab5c34f
[F] More correct control by a mouse
2018-05-24 17:11:21 +03:00
fd7f07068c
[F] React on mouse pressing ig view only.
2018-05-24 13:05:50 +03:00
f56432f713
[F] One alignment for labels.
...
[-] Unused checkbox.
2018-05-24 13:04:39 +03:00
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
348b34a2de
[F] Wrong type in equation.
2018-05-21 17:38:43 +03:00
e75cc86375
Merge branch 'master' into qt-5.11
2018-05-18 14:58:45 +02:00
5bbf0a8afa
Add missing assimp_qt_viewer install target
2018-05-16 14:02:54 +02:00
7251c3c51a
Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone)
2018-05-16 14:02:54 +02:00
1b71c2fd34
Merge branch 'master' into assimpviewer_dev
2018-05-13 10:41:16 +02:00
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
a5a4da8900
Appveyor: adapt install script.
2018-05-10 09:19:53 +02:00
d441dcd523
addmissing file.
2018-05-09 19:15:42 +02:00
60d803f490
Some minor fixes of typos and formatting issues.
2018-05-09 09:51:05 +02:00
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
a9dcbedefb
Make: save environment during make.
2018-05-07 22:07:19 +02:00
ce11aa51f5
add win32-based make script.
2018-05-07 00:07:41 +02:00
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
8cb25328cb
committing all changes.
2018-04-05 17:50:30 +10:00
4254142575
Updated GLView to draw with white lighting after drawCoordSystem().
2018-04-05 06:37:18 +10:00
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
145a09a775
Merge branch 'master' into info_more_mesh_info
2018-02-28 21:38:52 +01:00
ce7673979b
assimp_cmd export: print error message on failure.
2018-02-25 10:10:07 +01:00
e7736022c8
assimp_cmd info: list meshes and print basic mesh stats.
2018-02-25 09:34:14 +01:00
a8fc22fd3f
assimp_cmd: Add --verbose flag to 'info' command, to print node transforms.
2018-02-21 12:57:45 +01:00
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
ebaa8be106
fix findings.
2018-01-23 13:02:13 +01:00
98c053a9b9
Fix textures
2018-01-23 13:02:03 +01:00
6a76959f5b
"s, <s, and >s oh my...
2018-01-06 21:20:45 -08:00
0c4c66be50
I assume too much about header paths...
2018-01-06 21:00:11 -08:00
123fb1d009
../../code header path oversight fixed
2018-01-06 20:50:01 -08:00
a8a1ca9894
header paths adjusted for unit tests and samples
2018-01-05 23:12:40 -08:00
Kim Kulling
kimkulling
kkulling
Marc-Antoine Lortie
Aaron Franke
Marc-Antoine Lortie
escherstair
Gordon MacPherson
Rémi Verschelde
Alexandre Avenel
RichardTea
Charlie Gettys
Martin Jerabek
d
Cloud Wu
smalcom
Andreas Sturmlechner
Jean-Louis
James Carthew
Tommy
BuildTools