Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,111 Commits 19 Branches 43 Tags
b2b671d8adffe7bbc8d6187e075d064ee44f74b9
Commit Graph

209 Commits

Author SHA1 Message Date
Kim Kulling
f49de6ecfe closes https://github.com/assimp/assimp/issues/1514: add postprocess step for scaling 2017-10-29 20:28:59 +01:00
Kim Kulling
d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2 
glTF 2 Importer + glTF 2 Spec Conformity
 2017-09-13 20:01:38 +02:00
Kim Kulling
cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. 2017-09-12 18:59:38 +02:00
Daniel Hritzkiv
63d3655f1b Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List 2017-09-11 10:50:36 -04:00
Kim Kulling
44e2ba541f Merge pull request #1363 from jamesgk/gltf2 
glTF2 export support
 2017-07-29 15:08:52 +02:00
7557fdbb72 Fix install for builds with MSVC compiler and NMake. 
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
 2017-07-29 07:45:25 -04:00
jamesgk
d7cbbaf23e Compile with glTF2 export option (currently same as glTF1 output) 2017-07-25 17:34:03 -07:00
Patrick Dähne
457dff1bf1 X3D importer: Implemented support for binary X3D files 2017-07-11 19:28:40 +02:00
Kim Kulling
afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Kim Kulling
612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Kim Kulling
d7e13e67c4 Utf8: integrate new lib. 2017-06-17 19:38:47 +02:00
Kim Kulling
febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev 
MikuMikuDance Format
 2017-05-17 12:01:46 +02:00
VennGrayDog
3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Squareys
cfb867b5e7 Fix config.h not being found during install 2017-05-09 21:51:49 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Helio Chissini de Castro
4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal 
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.

Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists

Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
 2017-04-29 08:10:44 +02:00
Guillaume Bittoun
0e3956caf1 Compilation fix: Removing the vector4 headers from code/CMakeLists.txt 2017-04-08 23:25:39 +02:00
Kim Kulling
2825d2daf8 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-07 17:50:20 +02:00
Kim Kulling
38fab5ae8e doc updatedoc update 2017-04-07 17:46:53 +02:00
Andre Schulz
0f6782df27 Fix PDB file installation in RelWithDebInfo configuration 2017-04-01 16:03:01 +02:00
aoowweenn
51dae22828 merge master and adjust assimp/DefaultIOSystem.h 2017-03-27 22:35:19 +08:00
Kim Kulling
1c6145b39e Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api 2017-03-11 18:19:36 +01:00
aoowweenn
83db3fc084 fixup! remove dependency of ICU library 2017-03-05 23:14:21 +08:00
aoowweenn
7226d73682 merge master and mv FindDevIL to cmake-modules 2017-03-05 23:07:06 +08:00
aoowweenn
34906071fc remove dependency of ICU library 2017-03-05 22:59:53 +08:00
Antoine Bolvy
5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Antoine Bolvy
d77989088c Allow to enable importers in a whitelist manner 2017-02-28 11:42:53 +09:00
UMW
e80d3aa9d4 finish mesh creation 2017-02-27 21:02:58 +08:00
aoowweenn
4045466f73 pass through but panic 2017-02-24 08:35:15 +08:00
Kim Kulling
f121e2eb66 Fixes https://github.com/assimp/assimp/issues/1143: fix build. 2017-01-19 11:18:33 +01:00
Antti Määttä
9621dff027 Morph animation support for collada 2017-01-12 13:41:32 +02:00
Mika Rautio
8929760b3e Add better MinGW support for IFCReaderGen big objects 2016-12-05 12:57:05 +02:00
Mika Rautio
17fc3eea8f Do not build exporter if its importer is not built 2016-12-05 11:12:46 +02:00
Kim Kulling
43e1cae2ea Fix appveyor build: disable bugger mingw config. 2016-11-28 10:40:10 +01:00
Kim Kulling
a9c5b6f1be Ensure that filelist for assimp lib is not empty for coveralls. 2016-11-17 19:57:24 +01:00
Jared Mulconry
eceb61b854 Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set 
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8.
 2016-11-14 22:52:29 +11:00
Kim Kulling
cbe2e9af49 Merge branch 'master' into new_obj_stream_handling 2016-10-22 21:04:02 +02:00
Matthew Waters
cbcaa107eb cfileio: fix leaks by not closing files in the destructor 
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them.  The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.

This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
 2016-10-18 00:35:56 +11:00
Kim Kulling
905e48a35c Buffered stream API for big files: add next try of a prototype.^ 2016-10-11 12:29:40 +02:00
Alexandr Arutjunov
9d40f36f87 [F] Fixed type in list. 
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
 2016-10-04 23:58:51 +03:00
Alexandr Arutjunov
3086a07e86 [*] Docs and build-files fixes. 2016-10-02 17:27:13 +03:00
Alexandr Arutjunov
db54eb98e3 Merge branch 'import_amf' into import_x3d 2016-09-30 00:30:26 +03:00
Alexandr Arutjunov
ef9b6a7375 [F] Removed UTF-8 BOM 2016-09-29 23:16:59 +03:00
Alexandr Arutjunov
3274951f2a [+] X3D importer. 2016-09-29 18:50:24 +03:00
Alexandr Arutjunov
0a25b076b8 Merge branch 'master' into import_amf 2016-09-28 17:51:59 +03:00
Alexandr Arutjunov
386128febc [+] Building AMF-importer. 2016-09-26 12:57:44 +03:00
Kim Kulling
b50d734d75 IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 ( 
Thanks Qt! )
 2016-09-23 19:48:38 +02:00
Alexandr Arutjunov
a9284e5a95 [F] Removed unneeded definitions. 
[F] Add library for linker.
 2016-09-15 20:39:39 +03:00
Alexandr Arutjunov
65048d1ef7 [F] Removed Unicode BOM at file beginning. 2016-09-15 14:45:00 +03:00
Alexandr Arutjunov
40cfb45c74 [F] Not set option-variable (only define for compilation was set. 
[F] For adding library can not be used TARGET_LINK_LIBRARIES
 2016-09-13 13:29:12 +03:00