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

2566 Commits

Author SHA1 Message Date
Kim Kulling
d36fbfbb8b Merge branch 'master' of https://github.com/assimp/assimp 2017-05-10 18:30:36 +02:00
Kim Kulling
0300574b8b AMFImporter: fix coverity findings. 2017-05-10 18:29:42 +02:00
Kim Kulling
b8747fffca Merge pull request #1259 from Squareys/fix-cmake-install 
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
 2017-05-10 09:37:04 +02:00
Kim Kulling
9ef1a4fae0 X3D: fix coverity findings. 2017-05-09 22:54:04 +02:00
Squareys
cfb867b5e7 Fix config.h not being found during install 2017-05-09 21:51:49 +02:00
Kim Kulling
eb828a3b71 X3DImporter: fix coverity findings. 2017-05-09 21:35:21 +02:00
Kim Kulling
4a5c483ac4 AMFImporter: make test against nullptr dereferencing meaningful. 2017-05-09 21:03:20 +02:00
Kim Kulling
f77e27ca19 ColladaExporter: remove self assignment. 2017-05-09 20:59:01 +02:00
Kim Kulling
03d97b23ec Coverity: fix finding in COBLoader. 2017-05-09 20:15:30 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling
186629b372 SpatialSort: use std::vector::resize( 0 ) to improve readability. 2017-05-08 21:57:08 +02:00
Kim Kulling
65653edf88 Merge branch 'master' of https://github.com/assimp/assimp 2017-05-08 21:29:07 +02:00
Kim Kulling
5289954e27 Fix review findings. 2017-05-06 20:57:17 +02:00
Kim Kulling
98100d8cab Blender-Importer: fix coverity findings. 2017-05-06 11:14:04 +02:00
Kim Kulling
39e048dea6 Merge pull request #1254 from samitc/master 
Improve performance of obj line break
 2017-05-04 19:53:51 +02:00
Kim Kulling
7f014ea889 Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri 
Fix incorrect truncation of binary URI in glTF exporter
 2017-05-04 19:52:18 +02:00
John Senneker
d6e8fd34f0 Search for .gltf extension at end of file name for buffer prefix. 
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
 2017-05-03 15:11:31 -04:00
Amit Cirt
dd1d10407e make array non static to support multithreaded 2017-05-01 16:54:07 +03:00
Amit Cirt
8b4e066ca5 Improve performance of obj line break 2017-05-01 16:32:49 +03:00
rdb
0069552183 Fix static init ordering bug in OpenGEX importer 2017-05-01 15:11:22 +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
Tyson Grant Nottingham
8445db2cd9 Set UVW index material properties for OBJ files. 2017-04-21 01:09:26 -07:00
Andy Maloney
b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
Amit Cirt
9fc7f72b55 fix line breakes in obj files 2017-04-11 17:16:18 +03: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
Maarten Heremans
8f3aaa88f9 Fixed compiler error on clang 4.0 running on OSX 
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
      (aka 'aiVector3t<float> *') and 'int')
                if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
 2017-04-03 11:07:43 +02:00
Andre Schulz
0f6782df27 Fix PDB file installation in RelWithDebInfo configuration 2017-04-01 16:03:01 +02:00
Kim Kulling
6d71e4d5d7 Config.h.in: fix typo. 2017-03-29 21:08:40 +02:00
Kim Kulling
1ab85f16ff Merge pull request #1217 from Kai-W/master 
Added ComponentType Unsigned int and Error handling
 2017-03-28 17:06:06 +02:00
Kim Kulling
8accf5b386 3MF: reformattings. 2017-03-28 00:35:56 +02:00
Kai Westerkamp
6c73cc8aff Added ComponentType Unsigned int and Error handling 
Part of GLTF 2.0 changes
 2017-03-27 17:22:49 +02:00
Kim Kulling
1c525a9365 Merge pull request #1208 from terziman/master 
Added parameters to IFC importer to control tessellation
 2017-03-22 20:08:21 +01:00
rmitton
d1c7d905e8 Fixed infinite loop on non-manifold geometry 
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
 2017-03-19 13:46:23 -07:00
rmitton
209e972762 Fixed faceted normals in SIB importer. 2017-03-18 14:52:48 -07:00
Leo Terziman
bf2e2f7537 Extended support for tessellation parameter to more IFC shapes 2017-03-17 14:55:18 +01:00
Leo Terziman
d4ead31c18 Merge remote-tracking branch 'github/master' into contrib 2017-03-17 12:13:52 +01:00
Leo Terziman
9ef234b842 Added parameter to control cylindrical shapes tessellation 
+ renamed smoothing angle parameter for better user understanding
 2017-03-17 11:58:50 +01:00
Leo Terziman
fff0e886a1 Fixed bug in IFC openings when curmesh.vertcnt is empty 2017-03-17 11:53:36 +01:00
Kim Kulling
2cd6c3d755 Closes https://github.com/assimp/assimp/issues/1128: do not use non 
verbose format flag for import.
 2017-03-14 19:01:41 +01:00
Kim Kulling
bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01: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
Kim Kulling
b47bfeb0d7 StringUtils: add the right missing header. 2017-03-11 17:25:34 +01:00
Kim Kulling
6179e22749 StringUtils: add missing include for VS2012 & 2013 2017-03-11 11:34:23 +01:00
Leo Terziman
8bc183182c Added new option to IFC importer to control tessellation angle 
+ removed unused IFC option
 2017-03-10 14:42:17 +01:00
Kim Kulling
b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes 2017-03-08 10:27:57 +01:00
Kim Kulling
3bd9efa82c Cleanup_includes: fix linux build. 2017-03-08 09:55:44 +01:00
Kim Kulling
8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling
e6dcad384a Fix missing includes. 2017-03-05 15:05:40 +01:00