Commit Graph

2695 Commits (3ef1f37a809ee7876d1faee0262d0b72ae7f8315)

Author SHA1 Message Date
Kim Kulling 243df452a4 GeometryBuilder: fix update of vertices. 2016-08-25 18:20:52 +02:00
Kim Kulling 85b3e45aa7 Merge pull request #984 from jwwalker/upstream
Add typecasts in glTFAssetWriter.inl to fix compile errors
2016-08-19 10:26:48 +02:00
James Walker 666d1ce164 Changed C-style casts to static_cast. 2016-08-18 10:55:24 -07:00
Daniel Knezevic c2c12c1db5 Use Assimp namespace to fix build for big-endian architectures 2016-08-18 10:51:20 +02:00
James Walker e9ecd6f8a7 Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980> 2016-08-17 17:48:29 -07:00
Chris Russ 3f08cebfab include config.h to always have the correct types (float/double) exposed 2016-08-17 07:57:31 +10:00
Chris Russ 4f7b624fe8 fix precision issue within memory copy 2016-08-16 16:03:56 +10:00
Chris Russ 63a4591683 Fixing bugs related to 64-bit upgrade in materials 2016-08-16 16:03:56 +10:00
roshan.c 27f81884f9 adding support to store all the layered textures 2016-08-15 09:58:53 -07:00
Alexandr Arutjunov 2732e5d9b6 [F] Removed Unicode BOM. 2016-08-14 19:49:05 +03:00
Alexandr Arutjunov e0356b09be Merge branch 'master' into gltf_o3dgc 2016-08-14 16:49:53 +03:00
Alexandr Arutjunov 48f8c117e2 [F] Conditional compilation for Open3DGC-extension.
[F] Flag comp_allow did not reset when mesh can not be encoded.
2016-08-14 16:27:16 +03:00
Kim Kulling b916857659 closes https://github.com/assimp/assimp/issues/967: add unzip include path
when no other version was found.
2016-08-14 11:44:21 +02:00
Alexandr Arutjunov de70f5c028 [+] Added link to RT library when using Open3DGC-compression. 2016-08-13 17:44:58 +03:00
Alexandr Arutjunov 3a10a3cf03 [-] Removed unneeded include. 2016-08-13 16:27:34 +03:00
Alexandr Arutjunov 8ab50aa9a0 [*] Few C++11 constructions are removed. 2016-08-13 16:27:07 +03:00
Alexandr Arutjunov 1844665693 [*] Few C++11 constructions are removed. 2016-08-13 16:09:21 +03:00
Kim Kulling 0379675fca Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0 2016-08-12 18:47:37 +02:00
Kim Kulling 83b02ff41f DefaultIOStream: add missing detection for apple-based OS. 2016-08-12 18:14:26 +02:00
Kim Kulling bdcff35d5d closes https://github.com/assimp/assimp/issues/901 2016-08-12 17:13:18 +02:00
Alexandr Arutjunov 0ad2f2247a [+] glTF import/export. Support for Open3DGC-compression of mesh primitives. 2016-08-11 01:04:30 +03:00
Alexandr Arutjunov 778ad7f06f [+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression. 2016-08-09 13:37:32 +03:00
Alexandr Arutjunov 9a4fa1321b [+] Save parameters of mesh extension: Open3DGC-compression. 2016-08-09 13:26:57 +03:00
Alexandr Arutjunov 507668229f [+] Support Open3DGC for glTF import/export. Intermediate commit. 2016-08-08 19:24:50 +03:00
Alexandr Arutjunov 41ed74beb6 [*] Style. Intermediate commit. 2016-08-08 19:07:30 +03:00
Alexandr Arutjunov a6ec0e4c7a [*] Style. Intermediate commit. 2016-08-08 19:06:17 +03:00
Alexandr Arutjunov 29e982e185 [F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl. 2016-08-03 18:06:38 +03:00
Alexandr Arutjunov c024beadba [+] Put information to log about decompressing. 2016-08-03 11:16:30 +03:00
Alexandr Arutjunov 5e4fd5fa3c [+] glTF. Support for import meshes with Open3DGC compression. 2016-08-03 03:46:04 +03:00
Alexandr Arutjunov 2e452205aa [+] Building of Open3DGC codec. 2016-08-03 03:40:53 +03:00
Alexander Gessler 454320ad08 Merge pull request #953 from TrianglesPCT/master
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
2016-07-27 21:37:02 +02:00
TrianglesPCT 66c1a176de Add files via upload
forcing a new build
2016-07-25 23:04:08 -06:00
Adi Shavit @ MacBookPro f119447549 Fixes compilation on OSX with gcc.
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
2016-07-25 16:33:25 +03:00
TrianglesPCT 667aa37fdd Add files via upload
used ai_real instead of float
2016-07-24 18:45:41 -06:00
TrianglesPCT 28c9f56c5e Add files via upload
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
TrianglesPCT bcb86bcc35 Add files via upload
fix blender vert colors being casted to signed char, which was causing negative values.

Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies
2016-07-24 02:23:59 -06:00
Volodymyr Boichentsov 5c5acae92e Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
Fixed issue in case 'usemtl' goes straight after 'g'.
2016-07-22 14:10:06 +01:00
Kim Kulling 5fc3ee9a21 fix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare in blender. 2016-07-17 13:54:01 +02:00
Chris Russ c57b524a59 moving cmake configure_file to appropriate location 2016-07-16 18:47:59 +10:00
Chris Russ a7894b090d Upgrading PLY exporter to allow element definition as double 2016-07-16 18:23:33 +10:00
Chris Russ ad8bb32561 Properly defining build-time defines in config.h 2016-07-16 18:23:33 +10:00
Chris Russ 05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Chris Russ fa1d6d8c55 propagating precision requirments into operations 2016-07-16 18:23:33 +10:00
Chris Russ 5adb0e899c CMake Option and moving more functions to optional double support 2016-07-16 18:23:33 +10:00
Chris Russ 2f7e3dcdcc Basic changes to introduce optional double precision 2016-07-16 18:23:33 +10:00
Kim Kulling 45fae27aed DefaultIOStream: export class for testing. 2016-07-16 09:13:59 +02:00
Kim Kulling a15a77dff5 glTF: fix doxygen typo. 2016-07-15 10:35:44 +02:00
Kim Kulling e1697b30bc Blender: mark local function as static. 2016-07-15 10:33:48 +02:00
Kim Kulling 9678da72c9 Public includes: add pragma statement and formalize include guard schema. 2016-07-11 20:56:38 +02:00
Kim Kulling 02602ce9af Update license date. 2016-07-10 15:34:58 +02:00
Kim Kulling a8673d4828 Merge pull request #941 from assimp/feature/issue_940
Feature/issue 940
2016-07-08 19:29:51 +02:00
Kim Kulling 4d012bc476 Update version. 2016-07-08 18:40:26 +02:00
Kim Kulling 599e846f57 Remove dead code. 2016-07-08 18:31:19 +02:00
Kim Kulling 070fb3363f Closes https://github.com/assimp/assimp/issues/940: use standard offsetof
instead of an own version.
2016-07-08 18:30:26 +02:00
Chris Russ a5b3ce9a3c reverting back to 16 digit precision export
having to import 17 digit floats likely leads to issues in many other apps
2016-07-06 15:33:51 +10:00
Chris Russ 10f22779f4 setting default export precision to 17 for all exporters 2016-07-06 14:49:14 +10:00
Kim Kulling 19769eef8b Version: prepare 3.3 version. 2016-07-05 18:43:16 +02:00
Fabian Herb 7b08233ef2 Fix identation 2016-07-01 17:08:28 +02:00
Fabian Herb 3c7dd2b302 More whitespace consistency 2016-07-01 17:02:54 +02:00
Fabian Herb 616aa022a7 CMake: whitespace consistency, variable naming 2016-07-01 16:57:45 +02:00
cmdrf 9c7de7b2a8 Update to latest Melange SDK 2016-07-01 14:50:46 +02:00
Kim Kulling 886cea2933 Merge pull request #927 from royshil/obj_color_vertices_support
adding support for per-vertex colors in OBJ files.
2016-06-28 22:08:59 +02:00
Kim Kulling 5321072007 Static code analysis: fix minor finding. 2016-06-28 11:25:04 +02:00
Roy Shilkrot 7d98643bcf adding support for per-vertex colors. 2016-06-27 20:08:22 -04:00
Kim Kulling 9b6de15b74 closes https://github.com/assimp/assimp/issues/904: add ai_strtof for
VS2012.
2016-06-20 20:30:29 +02:00
Kim Kulling 447a9642c2 closes https://github.com/assimp/assimp/issues/918: use correct lib
install name for macos.
2016-06-17 20:42:19 +02:00
Kim Kulling b01e424476 Merge pull request #917 from assimp/feature/new_includes
Feature/new includes
2016-06-14 22:54:56 +02:00
Kim Kulling 62e07a8af0 closes https://github.com/assimp/assimp/issues/911: use correct include
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
Kim Kulling 334ac9a7d0 Merge pull request #908 from Adjective-Object/master
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
Kangning Li f15b6177f7 glTFExporter fixes: spaces to tabs 2016-06-10 13:41:59 -04:00
Kangning Li 32d9ef042a Merge branch 'master' into gltfErrors 2016-06-10 09:51:35 -04:00
Kangning Li c98e77907c fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets 2016-06-10 09:49:04 -04:00
Kim Kulling 81773b4e4e Update fast_atof.h
Fix include brackets.
2016-06-07 11:51:09 +02:00
Kim Kulling 7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
Maxwell Huang-Hobbs d23439451a Added 'joint' node type to Collada export 2016-06-05 21:04:02 -04:00
Kim Kulling 814d2e7821 Merge branch 'master' of https://github.com/assimp/assimp 2016-06-04 19:04:06 +02:00
Kim Kulling 0a1dda22b2 ColladaParser: add warning when empty semantic will be parsed. 2016-06-04 17:53:51 +02:00
Kim Kulling d67c8c29b6 Merge pull request #898 from turol/cxx11-refactor
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
Dirk bb2b30e54a fix strncpy not null terminated bug 2016-05-26 16:13:21 +08:00
Kim Kulling 8fa0071d16 closes https://github.com/assimp/assimp/issues/892: add own to_string
implementation.
2016-05-26 00:44:29 +02:00
Kim Kulling 4e982c0538 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-26 00:41:48 +02:00
Kim Kulling 2cbbc3da09 OpenGEX-Importer: remove dead code. 2016-05-26 00:41:31 +02:00
Kim Kulling abad093d09 Update OpenGEXImporter.cpp
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
Kim Kulling 5463146688 Add std::string header. 2016-05-25 00:58:05 +02:00
Kim Kulling f9f493d017 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-25 00:27:16 +02:00
Kim Kulling 037fec275c std::to_string: add replacement for android build chain. 2016-05-25 00:26:41 +02:00
Turo Lamminen 381f87507f SplitLargeMeshes: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 896ab8eee2 Unreal: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen d238597459 Raw: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 6c9c040419 Q3BSP: Use C++11 range-based for loop 2016-05-23 17:33:51 +03:00
Turo Lamminen a09a6a40c0 OpenGEX: Use C++11 range-based for loop 2016-05-23 17:33:49 +03:00
Turo Lamminen 32e4dd0bd1 Ogre: Use C++11 range-based for loop 2016-05-23 17:30:48 +03:00
Turo Lamminen 3eb9b8e91b NFF: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen ac676d4d3c MD5: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen b9fbfbc18a LWO: Use C++11 range-based for loop 2016-05-23 17:30:42 +03:00
Alexander Gessler cd4f212b5f Merge pull request #891 from ciechowoj/blender_materials
Blender materials
2016-05-22 14:39:45 +02:00
Turo Lamminen 3031470ec1 IRR: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen c7c756d344 FBX: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 8566b9aa90 D3MF: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 52405bbe1b Collada: Use C++11 range-based for loop 2016-05-22 13:57:11 +03:00
Turo Lamminen f0ebb40f19 ASE: Use C++11 range-based for loop 2016-05-22 13:57:09 +03:00
Turo Lamminen b345f79d45 3DS: Use C++11 range-based for loop 2016-05-22 13:57:06 +03:00
Kim Kulling 38ce71d5a0 Update glTFAsset.inl
closes https://github.com/assimp/assimp/issues/893: fix invalid memcpy usage.
2016-05-19 09:10:56 +02:00
Kim Kulling c9c6fda28e Merge pull request #889 from ciechowoj/area_lights
Adds support for area lights.
2016-05-18 00:11:05 -07:00
ciechowoj c554b55f97 Merge branch 'blender_materials'
Conflicts:
	test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
ciechowoj c4a542a994 Adds blender material loading. 2016-05-17 21:17:51 +02:00
Richard Selneck fc5464eb38 Pull from upstream, 5/17/2016 2016-05-17 08:44:38 -04:00
ciechowoj 913f26475d Adds importing blender material. 2016-05-16 21:17:58 +02:00
ciechowoj 25d84a6aff Adds support for area lights. 2016-05-16 13:04:43 +02:00
Kim Kulling 560e1eebc1 fix for https://github.com/assimp/assimp/issues/887: add missing define. 2016-05-16 11:24:04 +02:00
Kim Kulling 1acd24e0ae iSIBImporter: fix possible dereferncing of a null pointer. 2016-05-15 19:56:29 +02:00
Kim Kulling 6575696459 OpenGEX: fix coverity findings. 2016-05-15 18:57:10 +02:00
Kim Kulling e1084b5314 Merge branch 'feature/opengex_missing_features' 2016-05-14 10:36:46 +02:00
Kim Kulling 210182b17a OpenGEX: fix coverity findings. 2016-05-14 10:10:05 +02:00
Otger 159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +02:00
Richard Selneck 86a636fbbf Add in IRRMESH option 2016-05-09 18:26:18 -04:00
Kim Kulling e9085097f3 OpenGEX: add light impl and add examples. 2016-05-09 20:43:22 +02:00
Kim Kulling 0d5eb30a28 CameraObj: load camera data in the correct way. 2016-05-08 22:31:16 +02:00
Kim Kulling 82f73b6d03 OpenGEX: fix invalid access to textures. Next steps to camera and light. 2016-05-08 11:09:53 +02:00
Gorilux 00b574d746 Fixed compile issue for travis-ci 2016-05-07 15:36:05 +02:00
Gorilux 753b63c526 Removed override keywords so compilation success on gcc 4.6 2016-05-07 15:15:00 +02:00
Gorilux 89320bab46 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-07 14:18:17 +02:00
Gorilux 8f4f0047fb Added 3MF importer 2016-05-07 14:16:33 +02:00
Alexander Gessler 0b79d1ebda Revert previous glTF fix (e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions. 2016-05-05 19:11:33 +02:00
Alexander Gessler f5327a99ba Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives. 2016-05-05 19:05:02 +02:00
Alexander Gessler e5233283ef Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
2016-05-05 16:37:55 +02:00
Alexander Gessler 896120b76a Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings. 2016-05-05 15:41:50 +02:00
Alexander Gessler 167bc579c5 Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std. 2016-05-05 15:41:12 +02:00
Alexander Gessler 1daae7b7b9 STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation. 2016-05-05 15:40:36 +02:00
Alexander Gessler e7fd168114 Merge pull request #854 from tomacd/fix_scene_combiner
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
Kim Kulling e9b93788ca Merge pull request #863 from mpersano/master
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
Richard Selneck 12613720ff Fix macro used for detecting IRR support 2016-05-02 18:24:26 -04:00
Kim Kulling 8449afad71 Merge pull request #868 from otgerrogla/master
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger 11e52dc3d7 Removed rogue comma 2016-04-28 21:34:31 +02:00
Otger 2fe401fc54 Fixed gcc compilation error 2016-04-28 21:22:01 +02:00
Otger 64f78e003f Fixed crashes when files were not found, and fixed some warnings 2016-04-28 20:50:01 +02:00
Kim Kulling 46e7ae5dc0 OpenGEX: prepare light- and camera-node and object. 2016-04-28 20:20:40 +02:00
Otger d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
Kim Kulling 5192b837da Replace std::endl by using backslash n. 2016-04-27 17:58:40 +02:00
Kim Kulling 7468ca5c35 VS2015-code analysis: fix finding ( index var type too small ). 2016-04-23 09:43:20 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mpersano 473d2ca052 Fix texture coords exporting on binary PLY files 2016-04-22 16:09:45 -03:00
Kim Kulling 2f9c33e3e9 closes https://github.com/assimp/assimp/issues/857 2016-04-20 23:27:59 +02:00
Kim Kulling 0ec1e91722 Regression Testsuite: update database. 2016-04-19 08:49:14 +02:00
Kim Kulling 22dc22778d Assxml exporter: Make some local functions static. 2016-04-19 08:48:37 +02:00
Kim Kulling 1b94b8969f Blender Importer: fix review findings. 2016-04-19 08:45:04 +02:00
tomacd 5a8c15d826 fix SceneCombiner copy of aiNode not setting mParent field 2016-04-18 11:28:21 +02:00
Kim Kulling de39c49c4c assxml export: make local functions static. 2016-04-17 23:29:46 +02:00
Kim Kulling a6e7938696 Assxml io function: use vsprintf for var-argument list. 2016-04-17 21:33:11 +02:00
Kim Kulling dec93efc92 AssxmlExporter: fix crash in writing header info in VS2015. 2016-04-16 18:42:49 +02:00
Kim Kulling 6b243230b2 C++11-Support: remove boost. 2016-04-07 21:31:04 +02:00
Kim Kulling 632b58f27e Merge pull request #850 from mensinda/no-boost
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
mensinda b045a1ec5c Deleted move constructor of LazyObject 2016-04-06 21:03:54 +02:00
mensinda 3eafc7e746 Renamed Math.h --> MathFunctions.h 2016-04-06 16:54:03 +02:00
mensinda f59cba13eb Try fixing clang builds 2016-04-06 11:10:12 +02:00
mensinda 726b004806 Removed boost/noncopyable.hpp 2016-04-06 10:51:18 +02:00
mensinda 51c80ecb80 Moved gcd and lcm implemetation 2016-04-06 10:21:59 +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
mensinda b37e25cd7d Replaced boost::format with internal formater 2016-04-06 00:03:05 +02:00
mensinda 5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00
mensinda cff5b0d1a0 Replaced depreacated std::auto_ptr with std::unique_ptr 2016-04-05 22:56:11 +02:00
mensinda 18843fe5e1 Replaced BOOST_FOREACH with c++11 ranged for loops 2016-04-05 22:53:54 +02:00
mensinda 4836a2993e Replaced boost::thread with std::thread 2016-04-05 22:28:21 +02:00
Kim Kulling 20630e950a Regression test suite: add ui for simpler text execution. 2016-04-05 22:02:02 +02:00
Kim Kulling a2d9cbef7e Update STEPFileReader.cpp
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
Kim Kulling f2d5921252 Update FBXConverter.cpp
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling d094dfc3a1 Merge pull request #800 from pkholland/master
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
Kim Kulling 49d60dc856 Merge pull request #832 from assimp/no-boost
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
boxdot 0d44479399 Import reflectance factor from Blender. 2016-03-29 21:16:26 +02:00
Kim Kulling 1592a18210 PLYLoader: fix review comments. 2016-03-25 00:09:56 +01:00
Kim Kulling 42d29b1bfe Merge branch 'master' of https://github.com/assimp/assimp 2016-03-24 19:54:33 +01:00
Kim Kulling 7c71f0b7a9 PLYLoader: improve readability by refactorings. 2016-03-24 19:53:15 +01:00
Kim Kulling 6be4d82a6b Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
Kim Kulling 23892a6ded FBX: add debugging tool to log class type + info. 2016-03-22 20:30:25 +01:00
Kim Kulling ca0fa2ba69 FBX-Importer: put debug printf into comments. 2016-03-22 20:25:29 +01:00
Robert Liebo 124fc9ae27 [VCS-1030] add log info about .mtl fallback 2016-03-22 18:39:52 +01:00
Robert Liebo abb3e6b854 [VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl" 2016-03-22 18:38:28 +01:00
Sherief Farouk 397fa374a3 Removed usage of Boost static assert. 2016-03-18 17:02:39 -07:00
Kim Kulling 76e4e82ecb FBX: fix https://github.com/assimp/assimp/issues/782 2016-03-16 20:26:33 +01:00
Kim Kulling 644d6a9a67 Collada: refactorings. 2016-03-15 21:17:38 +01:00
Kim Kulling d89e7943ad FBX Close issue-806: support version 7400. 2016-03-15 21:16:47 +01:00
Kim Kulling e3d7ca264c Collada: reset workaround. 2016-03-15 19:28:57 +01:00
Kim Kulling 3a7c3a5698 Test for issue-731: possible overflow. 2016-03-14 21:00:08 +01:00
Kim Kulling 7e9fe2d654 OpenGEX: use correct number of uv-coordinates for texture coordinates. 2016-03-13 20:22:36 +01:00
Turo Lamminen 555f533777 MD3: Check file is big enough to contain all the advertised surfaces 2016-03-13 00:57:08 +02:00
Turo Lamminen da0b180901 MD3: Fix crash on invalid vertex index 2016-03-13 00:57:08 +02:00
Turo Lamminen b0f453dba8 MD2: Check file is big enough to contain all the advertised frames 2016-03-13 00:57:08 +02:00
Turo Lamminen 8d2af995de MD2: Fix integer overflows on malformed input 2016-03-13 00:57:08 +02:00
Turo Lamminen e2361bf209 MDL: Fix read past end of buffer on malformed input 2016-03-12 22:35:54 +02:00
Kim Kulling 6ee5fdf567 OpenGEX: fix review finding. 2016-03-12 20:55:11 +01:00
Kim Kulling b4b303ab55 OpenGEX: fix alloc for texture coordinates. 2016-03-12 13:22:09 +01:00
emvivre 93be0f69da PlyParser: fix invalid loading when comment is empty. 2016-03-10 17:47:07 +01:00
Thiago Goulart 3c9e57fd73 Fix memory leak in OBJ loader when a mesh has no faces. 2016-03-04 03:40:47 -08:00
Kim Kulling 53370d0d31 FBXImporter: some refactorings to increase readability. 2016-03-03 18:38:50 +01:00
Kim Kulling 2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Kim Kulling 3079b90622 Importer: when the right importer was found log this info. 2016-02-29 15:57:47 +01:00
Kim Kulling e9f47b08c5 FBXImporter: fx build. 2016-02-28 20:56:11 +01:00
Kim Kulling 28d327b7ea FBXImporter: fix build. 2016-02-28 20:27:31 +01:00
Kim Kulling 2496e8a0a3 Lib: reduce number of header files included. 2016-02-28 17:30:11 +01:00
Kim Kulling 58fc3940f2 Obj Importer: add missing semicolon to fix the build. 2016-02-25 19:04:13 +01:00
Kim Kulling 99f00834ec closes ssues/804: add statement to take care of emissive texture, new
version.
2016-02-25 18:00:09 +01:00
Paul Holland f20a5afcf0 can't add integer to string pointer 2016-02-18 12:17:47 -08:00
Alexander Gessler 38d462f0b3 Merge pull request #764 from rmitton/sib_import
Validation fix for empty SIB scenes.
2016-02-18 11:58:26 +01:00
Alexander Gessler 88fee56cce Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-18 11:53:57 +01:00
Turo Lamminen b71bd3df84 LWO: Fix division by zero 2016-02-13 23:37:08 +02:00
Kim Kulling 322c959424 Merge pull request #791 from trond/collada_animation_clip
Collada animation clip support
2016-02-11 22:11:27 +01:00
Kim Kulling f0717b1d7c Merge pull request #793 from AlexBobkov/master
Fixed installing pdb file
2016-02-11 22:10:21 +01:00
Alexander Bobkov a5f9d0d3fc Fixed installing pdb file 2016-02-11 16:24:26 +03:00
rdb 7d4a713a86 Fix loading of pk3 q3bsp maps
This fixes loading of pk3 maps.  The pk3 files contain directory entries with a size of 0, which triggered an assertion.
2016-02-11 14:10:49 +01:00
Trond Abusdal ccd9f92533 Fixed a couple of nested template brackets that wasn't spaced out correctly. 2016-02-11 01:00:03 +01:00
Vitaly Ovchinnikov 4d5df6dc9a use NormalizeSafe to prevent NaN when normalizing zero vectors 2016-02-11 12:19:06 +13:00
Trond Abusdal 7e58a47ba0 * Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
2016-02-10 23:57:29 +01:00
Kim Kulling d9017299a8 iObjParser: refactorings. 2016-02-10 10:40:39 +01:00
Kim Kulling 8681abe845 Obj_Importer: remove dead code. 2016-02-09 17:50:08 +01:00
Kim Kulling 1550191256 Closes https://github.com/assimp/assimp/issues/777: fix invalid skipping
of line during face defintion parsing.
2016-02-08 18:07:00 +01:00
Trond Abusdal c34717639e Collada: Importer generates animations from <library_animation_clips>, if the node is present. 2016-02-07 23:36:49 +01:00
rmitton 72b5ed50e9 Bump just to get AppVeyor to re-test it. 2016-02-07 13:21:58 -08:00
Kim Kulling 37a3976b30 Revert "Fix issue: OBJ import takes forever (#759) (attempt 2)" 2016-02-07 20:03:24 +01:00
Kim Kulling c084a47c5d Merge pull request #771 from andrewparlane/obj_load_forever_fix
Fix issue: OBJ import takes forever (#759) (attempt 2)
2016-02-07 20:00:03 +01:00
Kim Kulling 522f4e0882 Closes https://github.com/assimp/assimp/issues/786:
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
Kim Kulling dfbae1294f JoinVerticesProcess: iAdd test for possible null pointer access. 2016-02-05 18:53:23 +01:00
Kim Kulling a74b321ed1 Add unittests for defect reproduction. 2016-02-04 20:43:02 +01:00
Kim Kulling 699aa9c583 Closes https://github.com/assimp/assimp/issues/754: use correct index
token.
2016-02-03 21:09:20 +01:00
Turo Lamminen 0e06404ec1 SIBImporter: Properly fix C++11 issues for Clang
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
Kim Kulling a1bd83d797 ai_assert: split 2 checks in one macro to 2 separate ai_assert tests. 2016-02-01 16:16:09 +01:00
Kim Kulling 16fffb2ab1 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-31 00:42:02 +01:00
Kim Kulling a37ea18f09 SIBImporter: fix c++14 compilation issue for clang. 2016-01-31 00:41:14 +01:00
Kim Kulling bcd38707c5 3DSConverter: fix level 4 compiler warning. 2016-01-29 21:22:41 +01:00
Kim Kulling bac6067869 gltf: make code more radable and check against one possible null ptr
access.
2016-01-27 20:26:38 +01:00
Kim Kulling 0e7446af83 Merge branch 'master' of https://github.com/assimp/assimp 2016-01-27 18:49:26 +01:00
Kim Kulling 8bbd55a790 PostProcessing: first prototype of customized post processing. 2016-01-27 18:49:01 +01:00
Kim Kulling f473b17c99 Merge pull request #773 from boxdot/master
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
boxdot 13ec11bca8 Import mClipPlane{Near,Far} and mHorizontalFOV from Blender. 2016-01-27 02:12:15 +01:00
abma b3b08728fa fix new / delete missmatch 2016-01-26 22:47:50 +01:00
Andrew Parlane 109f6feb6e ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.

This time I've fixed the order of evaluation bug in the call to getFace().
2016-01-25 20:44:31 -04:00
Andrew Parlane c7d86e97cc ObjTools: Update getName() to work with const iterators.
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-25 20:43:34 -04:00
Kim Kulling 4633266c31 Revert "Fix issue: OBJ import takes forever (#759)" 2016-01-25 23:53:59 +01:00
rmitton f23285a1ce Fixed whitespace to match coding standard. 2016-01-25 13:45:08 -08:00
rmitton 94a35dfdd2 Fixed NULL pointers to match coding standards. 2016-01-25 13:42:30 -08:00
Andrew Parlane 9969167c2a ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
2016-01-23 20:01:44 -04:00
Andrew Parlane ce64dfb3fd ObjTools: Update getName() to work with const iterators.
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-23 20:01:44 -04:00
rmitton ae2cce0899 Validation fix for empty scenes.
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
Kim Kulling 0e4cf64a45 Merge pull request #763 from andrewparlane/mtlFix
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
2016-01-23 19:51:49 +01:00
Andrew Parlane 3c4e06c23f ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
2016-01-23 13:11:47 -04:00
Stepan Hrbek c062eb0db4 Collada exporter: improve compatibility when exported path contains ':'.
Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.
2016-01-21 22:35:44 +01:00
Kim Kulling df9bb8b915 Update license date. 2016-01-21 19:53:25 +01:00
Kim Kulling ded37e8307 Merge pull request #736 from StepanHrbek/collada-unicode
Collada exporter: fix unicode.
2016-01-19 16:35:48 +01:00
Stepan Hrbek 24f03141d6 Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version. 2016-01-18 10:10:49 +01:00
wise86Android c7f69e151e fix memory leak 2016-01-17 15:18:12 +01:00
wise86Android 4af9632269 fix memory leak 2016-01-17 00:00:43 +01:00
wise86Android bd032488e4 remove read unitilize memory 2016-01-16 23:42:43 +01:00
wise86Android d51c2e6435 free the allocated import 2016-01-16 23:37:24 +01:00
wise86Android f0fca826db remove initialization warnings 2016-01-16 23:28:52 +01:00
wise86Android 01a5035920 remove initialization warnings 2016-01-16 23:26:46 +01:00
Kim Kulling 8c13c8a558 PLYExporter: forbit copying + add empty destructor. 2016-01-14 20:44:09 +01:00
Kim Kulling 18c0e41d8f Colladaloader: fix usage of floorf. 2016-01-13 10:04:24 +01:00
Kim Kulling 42c1f9d3ba Closes https://github.com/assimp/assimp/issues/630: fix mis-merge. 2016-01-12 20:22:37 +01:00
Kim Kulling d3ddabbd3e Merge branch 'master' of https://github.com/assimp/assimp 2016-01-11 21:16:17 +01:00
Kim Kulling 36668aa31a ASEParser: fix invalid size of buffer for log writing. 2016-01-11 21:15:30 +01:00
Andrew Parlane 1632f1fbb9 ObjImporter: Added better progress reporting during file import.
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
2016-01-11 12:21:24 -04:00
Kim Kulling bd268bd864 coverity scan: add missing initialization. 2016-01-10 20:25:01 +01:00
Kim Kulling ec32da512b coverity scan: fix not initialized member in copy constructor. 2016-01-10 20:21:32 +01:00
Kim Kulling 3033d8c847 ColladaLoader: add missing .f 2016-01-09 18:09:52 +01:00
Kim Kulling d18f978178 ColladaLoader: add missing members to initializer list. 2016-01-09 18:09:10 +01:00
Kim Kulling 430b614a69 coverity scan: make place of false positive more understandable. 2016-01-08 16:18:32 +01:00
Kim Kulling 7ef579674d GenVertexNormalsProcess: use initalizer list instead of setting the earch angle in the constructor. 2016-01-07 15:03:10 +01:00
Kim Kulling 56a77b2429 snprintf-replacement: fix invalid preprocessor defines for compiler
detection on windows for older vs-versions
2016-01-06 19:55:04 +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 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
Kim Kulling 67c258e75d snprintf: change next couple of sprintf to snprintf. 2016-01-05 11:38:06 +01:00
Kim Kulling c3d4be1dce sprintf: replace more sprintf by snprintf. 2016-01-04 22:24:25 +01:00
Kim Kulling c9d00beab8 sprintf: replace sprintf by snprintf. 2016-01-04 20:24:51 +01:00
Kim Kulling f4d3d15bbb UnrealLoader: replace sprintf by snprintf. 2016-01-04 20:22:46 +01:00
Kim Kulling 847644ca75 DefaultLogger: fix missing sprintf calls. 2016-01-03 23:29:37 +01:00
Kim Kulling 540c9f3e9f Fix assimp/assimp/issues/737: use snprintf instead of sprintf. 2016-01-02 21:29:46 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling 189340a99f License file: update to 2016 2016-01-01 20:24:10 +01:00
Kim Kulling 912cf63b71 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-31 19:49:37 +01:00
Kim Kulling 4e9ee4e406 coverity findings: add missing initialization. 2015-12-31 16:00:19 +01:00
Stepan Hrbek 39ab716e11 Collada exporter: Fix unicode filenames.
Although existing code uses "C" locale partially, both calls to isalnum() clearly did not use it.
So for example character "ä" was written to .dae as is, rather than converted to %e4, generated .dae was unreadable to many parsers.
2015-12-31 03:22:25 +01:00
Stepan Hrbek 15d84825d9 Collada exporter: Fix isalnum(negative number) assert.
isalnum(negative number) asserts in MSVC.
It was first visible problem when exporting unicode filenames.
2015-12-31 03:18:11 +01:00
Kim Kulling 217ec76dfb coverity findings: fix possible derefencing of null pointer. 2015-12-30 21:56:24 +01:00
Kim Kulling e02a7cdb3c Merge pull request #732 from StepanHrbek/collada-export
Collada exporter: bind uv channel numbers with <bind_vertex_input>.
2015-12-30 21:31:29 +01:00
Kim Kulling 68b12ac0c4 Merge pull request #735 from JLouis-B/master
Fix a crash issue in XFileExporter
2015-12-30 21:26:34 +01:00
Kim Kulling 043fef6d21 coverity findings: fix resource leak in MakeVerboseFormat. 2015-12-30 20:39:58 +01:00
Kim Kulling 56e9a9168c coverity findings: add missing initializations. 2015-12-30 20:04:16 +01:00
Kim Kulling 1ea1f6dcfa coverity findings: add missind intialization in STEPFile. 2015-12-30 20:02:35 +01:00
Kim Kulling e1818d8ab6 coverity findings: initialize lookup table for materials. 2015-12-30 19:43:57 +01:00
JLouis-B a02cc6c98e Fix a crash issue in XFileExporter 2015-12-30 19:01:04 +01:00
Kim Kulling 0f1874d954 coverity findings: initialize index counter in line splitter. 2015-12-30 16:33:54 +01:00
Kim Kulling 7c3475c002 Coverity findings: fix resource leak in PlyLoader.cpp. 2015-12-30 15:38:30 +01:00
Kim Kulling 0c1b5355f4 Coverity finding: remove not used function. 2015-12-30 15:35:26 +01:00
Stepan Hrbek ad55e769bf Collada exporter: bind uv channels with <bind_vertex_input>.
When there are multiple uv channels used by multiple textures, <bind_vertex_input> specifies what channels to use. Without <bind_vertex_input>, at least some importers are unable to match channels to textures.
2015-12-29 17:08:16 +01:00
Kim Kulling 22f7f60ba0 glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723 2015-12-27 20:36:54 +01:00
Kim Kulling 9409ce3b56 https://github.com/assimp/assimp/issues/714: fix null pointer access with
unknown texture.
2015-12-27 00:19:11 +01:00
Kim Kulling 9af4747fa8 github.com/assimp/assimp/issues/730: use correct define check 2015-12-26 21:02:32 +01:00
Alexander Gessler 5847576f41 Merge pull request #703 from terziman/master
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
Alexander Gessler 7e85f45abc Merge pull request #713 from ov/normalize-safe
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
Alexander Gessler 891411514b Merge pull request #721 from luho383/fbx_file_import
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-20 00:06:02 +01:00
lutz.hoeren 90ddb93940 Fix for FBX Files that do not have a Comma on a new line in a data block 2015-12-17 11:48:44 +01:00
lutz.hoeren e8a02ef890 Only read Element Data when there is a valid Mapping Information 2015-12-16 15:25:33 +01:00
Kim Kulling 87b3af4c3b Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707 2015-12-14 17:46:54 +01:00
Kim Kulling b60f57ece7 Merge pull request #716 from rmitton/empty_objmtl
Added support for empty .MTL files.
2015-12-14 09:29:31 +01:00
rmitton d952823ffd Importer for Silo SIB files.
Wrote an importer for Nevercenter Silo's binary SIB model format
2015-12-13 22:14:19 -08:00
rmitton b9a4e99607 Added support for empty .MTL files.
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
2015-12-13 22:13:25 -08:00
Vitaly Ovchinnikov b6f14eb917 Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation 2015-12-14 15:31:49 +13:00
Vitaly Ovchinnikov af40c99a6a trimming spaces around material names 2015-12-14 08:32:09 +13:00
Vitaly Ovchinnikov c9ef6132a8 a small fix 2015-12-13 23:10:31 +13:00
Vitaly Ovchinnikov 6214fbfbbe this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line 2015-12-13 22:54:50 +13:00
Joe Hermaszewski 210764a6ff Correct spelling 2015-12-10 16:19:33 +00:00
Kim Kulling b440f67aae Merge pull request #704 from Vertexwahn/master
Added missing DLL suffix for VS2015 build.
2015-12-09 23:52:15 +01:00
Kim Kulling 35fafe3a6f ColladaParser: use initializer lists again. 2015-12-09 23:49:03 +01:00
Vertexwahn 3013b6b62f Added missing DLL suffix for VS2015 build. 2015-12-09 21:58:29 +01:00
Kim Kulling bf4ca8162d Update ColladaParser.cpp
Introduce workaround again to fix the build.
2015-12-09 15:07:58 +01:00
Kim Kulling 9ae7d438f0 Update ColladaParser.cpp
Try to close resource leak.
2015-12-09 12:10:31 +01:00
Kim Kulling b694bfd021 fix build 2015-12-08 20:36:31 +01:00
Léo Terziman 6eebf8455a Merge remote-tracking branch 'official/master' into contrib 2015-12-08 15:25:13 +01:00
Léo Terziman 445ae1fec3 In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
2015-12-08 15:24:07 +01:00
Kim Kulling 0a6788d56f try to fix build. 2015-12-07 20:43:01 +01:00
Kim Kulling f5e13874e0 glTF: check if exporter option has broke someting. 2015-12-06 16:49:10 +01:00
Kim Kulling 99b51eb456 Merge branch 'master' of https://github.com/assimp/assimp 2015-12-06 12:20:11 +01:00
Kim Kulling 6641188a8e assimp/issues/702: fix resource leak and use initializer list for all
attributes of the loader instance.
2015-12-06 12:18:33 +01:00
Otger ffdcc78d91 Merge 2015-12-02 21:06:22 +01:00
Kim Kulling 8736907009 Importer: fix overflowImporter: fix overflow. 2015-12-02 19:58:43 +01:00
Kim Kulling f896c3329a Build: remove deprecated third party lib from cmake 2015-11-30 12:52:49 +01:00
Otger 166ff63af9 Updated CMAKE - removed removed package inclusion 2015-11-29 21:20:31 +01:00
Otger c5cb7f7b73 Merge branch 'master' of git://github.com/assimp/assimp 2015-11-29 21:17:05 +01:00
Otger f2c49a69ba Fixing gcc errors - second attempt 2015-11-29 21:13:35 +01:00
Otger d72443d6b0 Fixed gcc warnings and errors 2015-11-29 20:17:06 +01:00
Otger 4f757cdf5a Implemented basic glTF exporter and improved the importer (plus some code refactor) 2015-11-29 19:13:51 +01:00
Kim Kulling ba35c97e9d assimp/assimp/issues/698: Increase upper limits for hints. 2015-11-28 10:06:26 +01:00
Otger 5942d60aea Fixed gcc errors 2015-11-27 02:31:18 +01:00
Otger 526027999b Merge 2015-11-27 01:44:06 +01:00
Otger b307ec643d Created exporter class and fixed a few bugs 2015-11-27 01:16:48 +01:00
Kim Kulling fc6f35dab2 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-26 20:53:41 +01:00
Kim Kulling 502d9f17b6 glTF: add importer to registry and try to parse json. 2015-11-26 20:49:00 +01:00
Kim Kulling a655467b59 Merge pull request #692 from dankex/instance_image
instance_image support for sample2D in Collada 1.5
2015-11-26 14:06:09 +01:00
Kim Kulling 398c1361d3 Merge pull request #674 from suikki/master
FBX import: If animation is not defining keys for all vector components (x, y and z), use the node transform as the default value.
2015-11-26 13:50:34 +01:00
Otger 148a20a703 Experimental support for glTF 2015-11-26 02:36:22 +01:00
Kim Kulling 702ef1a513 glTF: add missing attribute buffer for text streams. 2015-11-25 22:31:23 +01:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Kim Kulling 65d366dad0 Merge pull request #694 from OtgerRP/master
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
Otger a51d9a3884 Ignore FBX 'PP' type connections (they were stopping the file parsing) 2015-11-24 17:51:11 +01:00
Yotam Gingold da013350f9 aiGetExportFormatDescription() no longer uses free'd memory
aiGetExportFormatDescription() now creates an Exporter object at the beginning of the function, so that a call to `GetExportFormatDescription()` doesn't access free'd memory.
2015-11-23 23:50:25 -05:00
Otger c876dce82b Fixed crashes for Video with no content 2015-11-23 21:46:55 +01:00
Kim Kulling 032fbe3fe5 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-23 21:29:51 +01:00
Kim Kulling 70540616ce issue 693: add missing release call in c-export interface. 2015-11-23 21:28:35 +01:00
Otger f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Danke Xie 24b68b1e3d Support instance_image in Collada 1.5 files
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
2015-11-19 17:36:23 -08:00
Danke Xie 57d7085fb8 Fix AndroidJNI header path in CMakelists.txt 2015-11-15 22:53:11 -08:00
IOhannes m zmölnig 756cfd4f74 fix compilation on BigEndian
cannot pass a function by reference where an lvalue is expected
(only applies to bigendian, where a macro expands to a byteswap function)

Closes https://github.com/assimp/assimp/issues/613
2015-11-13 22:33:20 +01:00
Kim Kulling e6ac1ed66a glTF-Importer: add files. 2015-11-08 20:29:05 +01:00
Kim Kulling 655cb65ab2 Version: increase version from 3.1.1 to 3.2. 2015-11-03 19:43:02 +01:00
Kim Kulling eadc6116c0 OpenDDLParser: latest greatest. 2015-10-31 09:43:34 +01:00
Kim Kulling 6f75ea5702 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-31 09:07:21 +01:00
Turo Lamminen 46121a1559 Mark single-parameter constructors explicit
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
Turo Lamminen 9825d07764 OFFLoader: Throw error on certain invalid files instead of failing validation later 2015-10-28 14:20:13 +02:00
Turo Lamminen 7a5bc6eca3 OFFLoader: Use a temporary vector to store vertices instead of a raw array
Prevents crash on certain malformed inputs but
they still cause a validation failure.
2015-10-28 14:10:18 +02:00
Turo Lamminen fba7ede639 OFFLoader: Don't use assignments as expressions 2015-10-28 13:39:10 +02:00
Olli Kallioinen 12ed07a939 FBX import: If animation is not defining keys for all vector components
(x, y and z), use the node transform as the default value.
2015-10-27 21:03:24 +02:00
Kim Kulling 5160975138 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-27 19:48:36 +01:00
Łukasz Twarduś 3274bcf8d6 Properly build path to the mtl file when loading loading obj 2015-10-25 20:04:50 +01:00
Francesco Guastella 2750f8da24 Added support for reflection maps for OBJ files 2015-10-15 15:46:35 +02:00
Sebastien Bonopera 62ec784cef Fixed issue in PlyParser (uint16 values misparsed) 2015-10-12 20:08:25 +02:00
Jaakko Keränen bfe3bee34b Merge branch 'master' into md5-fix 2015-10-07 16:49:45 +03:00
Kim Kulling 4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Kim Kulling 7ed32fd5a9 fix typo. 2015-09-27 20:49:15 +02:00
Kim Kulling 1fbc0cc276 DefaultIOSystem: fix typo in macro. 2015-09-27 10:51:33 +02:00
Kim Kulling f5c8f7b5e5 DefaultIOSystem: close cygwin issue assimp/assimp/issues/660. 2015-09-27 01:02:12 +02:00
Kim Kulling d06945f17e DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32
as well.
2015-09-24 23:51:04 +02:00
Kim Kulling 3fc251b326 BaseImporter: fix typo and rename attributes for better readability. 2015-09-24 00:57:47 +02:00
Kim Kulling ef6baa0acf DefaultIOSystem: use correct define to detect Visual Studi compiler. 2015-09-22 00:23:33 +02:00
Kim Kulling 34ee4c4b9a DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to
detect vs-compiler.
2015-09-21 20:43:58 +02:00
Kim Kulling 6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp 2015-09-21 17:34:01 +02:00
Kim Kulling ca6296f609 STLLoader: mak functions local. 2015-09-21 17:33:41 +02:00
Kim Kulling e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Kim Kulling 9708a4db93 Subdivision: fix compiler warning from debug check. 2015-08-30 13:48:00 +02:00
Alexander Gessler 305e27d1a5 Merge pull request #645 from l337r007/fix-osx-cmake
CMake: Don't try to set property on target before it is defined.
2015-08-29 14:58:53 +02:00
Alexander Gessler ce5baa95ca Merge pull request #647 from Gargaj/patch-1
add opencollada extension
2015-08-29 14:58:27 +02:00
Gargaj 1f6cead81b remove junk 2015-08-29 13:39:43 +02:00
Gargaj 9885c3e551 add opencollada extension 2015-08-28 16:20:17 +02:00
Wolfgang Herget 9f157ed9b8 CMake: Don't try to set property on target before it is defined.
The exact same code this commit removes is repeated in line 748.
There, it actually works, since the "assimp" target is defined there.
2015-08-26 12:36:57 +02:00
Jaakko Keränen d74a1149b7 MD5: Fix quaternion conversions
Some of the quaternions loaded from MD5 files were not converted
to follow Assimp conventions.

https://github.com/assimp/assimp/issues/495
2015-08-18 11:49:06 +03:00
Kim Kulling 4afddf316f Merge pull request #632 from turol/afl-fixes
Random crash fixes
2015-08-14 16:13:54 +02:00
Kim Kulling 91881065d7 Merge pull request #635 from turol/fix-bad-references
IFC: Don't store temporary values by reference
2015-08-14 16:12:07 +02:00
Andreas Henne ec43e08295 Fixed issue in STLLoader that lead to wrong node names. 2015-08-14 13:37:41 +02:00
Turo Lamminen e67bcca744 IFC: Fix more bad references 2015-08-14 14:02:16 +03:00
Turo Lamminen 4540250116 IFC: Don't store temporary values by reference
This is not legal in any way and should never have worked.
2015-08-14 13:32:45 +03:00
Turo Lamminen 0b0ba2ec4d Refactor logic which checks for too large allocations
It's now easier to change the limit
2015-08-14 11:53:16 +03:00
Turo Lamminen 5575a54466 Add various checks to avoid either too large or zero-sized memory allocations 2015-08-14 11:53:16 +03:00
Turo Lamminen e5ddb98dde STL: Fix another read past EOF 2015-08-14 11:53:13 +03:00
Turo Lamminen d185cea81c AC3D: Fix read past end of buffer 2015-08-14 11:37:00 +03:00
Turo Lamminen 4cc716a0f5 MDL: Fix read past end of buffer with malformed input 2015-08-14 11:37:00 +03:00
Andreas Henne bcf3f985fb Fixed spelling error. 2015-08-13 13:22:21 +02:00
Andreas Henne 860360bd86 Fixed merge conflicts. 2015-08-13 11:06:22 +02:00
Turo Lamminen b39446b7bb Avoid reading past EOF when encountering a malformed STL file
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
Kim Kulling 295a9abbdc Update CMakeLists.txt
Fix for https://github.com/assimp/assimp/issues/166
2015-08-10 13:13:01 +02:00
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Kim Kulling d8d64a8422 TLLoader: fix typo in comment. 2015-08-08 11:57:15 +02:00
Kim Kulling e794aaf017 STL-Loader: fix https://github.com/assimp/assimp/issues/103. 2015-08-08 10:55:10 +02:00
Kim Kulling 88746af2e6 Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131. 2015-08-07 21:22:09 +02:00
Kim Kulling 23dba9fcf2 Merge branch 'master' of https://github.com/assimp/assimp 2015-08-07 21:19:17 +02:00
Kim Kulling 8836fd6b34 PLY-Loader: fix https://github.com/assimp/assimp/issues/160. 2015-08-07 21:18:20 +02:00
Turo Lamminen 154760ab52 Abort early when hitting unexpected EOF in AC3D loader
Without this the code will try to loop through the specified number
of surfaces which could be very large even though none will succeed.
2015-08-07 14:18:16 +03:00
Kim Kulling 752961edfe Merge pull request #625 from turol/afl-fixes
Fix out-of-bounds write on malformed input
2015-08-06 17:41:09 +02:00
Turo Lamminen 128923a262 Fix out-of-bounds write on malformed input 2015-08-06 16:16:34 +03:00
Andreas Henne 5030fe8c7e Formatting changes. 2015-08-06 13:37:16 +02:00
Andreas Henne fb9e4d1266 Ply export now uses uchar as type for the number of vertices per polygon and int as vertex index type. 2015-08-06 13:30:49 +02:00
Andreas Henne 3fc56de33c Fixed merge conflicts. 2015-08-06 12:04:05 +02:00
Ilya Smelkov bb8d936246 Fix volume calculation 2015-08-02 19:45:39 +03:00
Wil Shipley 7a7a496320 - Add include of stdarg, because apparently that's needed to build of Github server with Travis. 2015-07-27 00:54:23 -07:00
Wil Shipley 8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd)
- Added at least some of the new files to my Xcode 6 project, as
well.
    - Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
Kim Kulling 5c00aef7cd iOpenGEX: use std::string for grammar::token. 2015-07-17 20:03:23 +02:00
Kim Kulling 5a207dbb19 Merge branch 'master' of https://github.com/assimp/assimp 2015-07-10 01:21:57 +02:00
Kim Kulling 14a849b398 Obj-loader: change include brackets. 2015-07-10 01:21:10 +02:00
Kim Kulling e138a02dd5 Obj: fix issue 121 - set group names as the mesh names. 2015-07-09 20:15:44 +02:00
Kim Kulling 891c17ee7b Obj: remove dead code. 2015-07-09 19:59:47 +02: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
Kim Kulling 4a77170399 Coverity finding: fix 2 more resource leaks. 2015-07-06 20:47:45 +02:00
rdb 1eef4c387f Correct value for mColorAmbient for COLLADA files 2015-07-05 14:30:27 +02:00
Russ Taylor c09eb045a1 Explicit conversion of a quantity that should be positive to unsigned to avoid compiler warning. 2015-07-04 18:08:31 -04:00
Kim Kulling bd0b58d906 Merge pull request #600 from LegalizeAdulthood/cppcheck-format-operator
Prefer Format::operator<< over Format::operator,
2015-07-04 09:29:47 +02:00
Kim Kulling 68f88752b3 Build: fix missing commas. 2015-07-04 09:22:11 +02:00
Richard 0faf53af0b Refactor: Prefer Format::operator<< over Format::operator, 2015-07-03 20:13:00 -06:00
Kim Kulling 05524726c8 Merge branch 'master' of https://github.com/assimp/assimp 2015-07-03 20:40:19 +02:00
Kim Kulling dff3476e50 Line endings. 2015-07-03 20:40:07 +02:00
Kim Kulling 3af8014055 INcreas readability. 2015-07-03 19:00:21 +02:00
Kim Kulling 001eef2a9f Coverify: fix resource leak. 2015-07-03 18:58:02 +02:00
Kim Kulling dc28746269 Compiler warning: fix missing commend block. 2015-07-03 16:11:31 +02: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 67cb86d166 Fixed: Correct memory leak found by cppcheck 2015-07-02 20:55:56 -06:00
Richard 987034e080 Fixed: Initialize all members in IntSplitGroupData_MDL7 2015-07-02 20:51:46 -06:00
Richard 9f0c12c1c6 Refactor: Prefer value initialization over std::fill 2015-07-02 20:51:46 -06:00
Richard c69e047dfc Fixed: Initialize all members in STLImporter 2015-07-02 20:51:46 -06:00
Richard 85f3b38643 Fixed: Initialize all members in SMDImporter 2015-07-02 20:51:46 -06:00
Richard e584fbdf47 Fixed: Initialize all members in PLYImporter 2015-07-02 20:51:46 -06:00
Richard 99e964d8b1 Fixed: Initialize members in MS3DImporter 2015-07-02 20:51:46 -06:00
Richard f13c99e898 Fixed: Initialize all members in MDLImporter 2015-07-02 20:51:46 -06:00
Richard 10ca67541e Fixed: Initialize all members in MDCImporter 2015-07-02 20:51:46 -06:00
Richard a9aa2b1579 Fixed: Initialize all members in MD5Importer 2015-07-02 20:51:46 -06:00
Richard 3ebf91d5bb Fixed: Initialize all members in MD3Importer 2015-07-02 20:51:46 -06:00
Richard abc47f1b4e Fixed: Initialize all members in MD2Importer 2015-07-02 20:51:46 -06:00
Richard e5c603ea1a Fixed: Initialize all members in LWSImporter 2015-07-02 20:51:46 -06:00
Richard f032c89c2d Fixed: Initialize members in LWOImporter 2015-07-02 20:51:46 -06:00
Richard df6e58fd40 Fixed: Initialize all members in LWOAnimation 2015-07-02 20:51:46 -06:00
Richard 6fb38a375e Fixed: Initialize members in SmoothinGroups 2015-07-02 20:51:46 -06:00
Richard db4232cb4a Fixed: Initialize members in LWSLoader 2015-07-02 20:51:46 -06:00
Richard 32a460f667 Fixed: Initialize members in UnrealLoader 2015-07-02 20:51:46 -06:00
Richard 3553c4aff2 Fixed: Initialize members in LWOFileData 2015-07-02 20:51:46 -06:00
Richard cd63601831 Fixed: Initialize members in LWOAnimation 2015-07-02 20:51:46 -06:00
Richard d822930848 Fixed: Initialize members in MDCFileData 2015-07-02 20:51:46 -06:00
Richard eaf63bd04b Fixed: Initialize members in SMDLoader 2015-07-02 20:51:46 -06:00
Richard 65ada2596f Fixed: Initialize members in PlyParser 2015-07-02 20:51:46 -06:00
Richard 5cc43ecfad Fixed: Initialize members in XFileHelper 2015-07-02 20:51:46 -06:00
Richard 3543bb7e5f Fixed: Initialize members in IRRLoader 2015-07-02 20:51:46 -06:00
Richard 2f0786068d Fixed: Initialize members in MDLFileData 2015-07-02 20:51:46 -06:00
Richard c014a2ed21 Fixed: Initialize members in BVHLoader 2015-07-02 20:51:45 -06:00
Richard 7cc46ebc22 Fixed: Initialize member sin ASEImporter 2015-07-02 20:51:45 -06:00
Richard a9a8796f71 Fixed: Initialize members in ACLoader 2015-07-02 20:51:45 -06:00
Richard d899f4db57 Fixed: Initialize members in 3DS loader 2015-07-02 20:51:45 -06:00
Kim Kulling 4619625b84 OpenGEX: add class for exporter. 2015-07-01 20:43:37 +02:00
Richard eee32a5668 Refactor: Expand tags to 4 spaces 2015-06-28 16:12:51 -06:00
Richard 4ec76d88f0 Refactor: Use LF for line endings 2015-06-28 16:11:05 -06:00
Richard e4b0c27a2e Refactor: Strip trailing whitespace 2015-06-28 16:09:18 -06:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Richard 8326535445 Implemented: Add editor config for source code 2015-06-28 15:50:57 -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
Kim Kulling db3aea4b18 Remove finding from code analysis. 2015-06-28 21:06:20 +02:00
Kim Kulling 6249a1c06f CMake: add comment for openddl-parser configuration. 2015-06-23 21:28:13 +02:00
Kim Kulling 85e2f47dc8 Merge pull request #523 from turol/afl-fixes
More crash fixes
2015-06-22 16:56:51 +02:00
Henry Stratmann III 328cae8a81 Added mesh name importing to .X ascii format. 2015-06-20 17:35:30 -05:00
Marvin Pohl ff145bfac5 Removed unused variable 2015-06-19 14:24:34 +01:00
Marvin Pohl 927c9cb3ce Fixes random crash when loading fbx files 2015-06-19 14:04:30 +01:00
rob100 b8c12fdc6f CodeQuality improvements
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
Alexander Gessler 36a9f2be1a Merge pull request #577 from g-pechorin/patch-4
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
Alexander Gessler 1a2f4ed105 Merge pull request #575 from g-pechorin/patch-3
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
Kim Kulling 9c26f229a3 - OpenDDL-Parser: latest greatest.
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
Peter LaValle 72b87ec526 removed x64 warnings 2015-05-31 13:35:10 +01:00
Peter LaValle 6ddb67b321 corrected misinformation in the documentation
> corrected note saying that the header was 500 bytes long (512 bytes are written and the number 512 is given elsewhere)
> altered confusing language about how long the chunks are ("length of chunk" implies the number includes the chunk-header. chunk-data-length less so, and reflects the fact that the number written doesn't include the chunk-header)
> removed mistake about how texture coordinates are encoded (the last release, and the current head both write texture coordinates as 3 float components regardless of what they actually are)
2015-05-30 23:40:17 +01:00
Kim Kulling 6cc32a946b Fix transformation parsing for OpenGEX-parser. 2015-05-29 20:50:09 +02:00
Kim Kulling 670278da82 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-29 20:46:10 +02:00
Kim Kulling 5e1fc39448 Add parsing of texture nodes of OpenGEX-format importer. 2015-05-29 20:45:31 +02:00
Jaime Machado Neto de6f0f2a7d Creating the functionality to list all Importer descriptions and the number of importers available. 2015-05-26 08:40:43 -03:00
Andy Maloney 4cbce374b6 Code Cleanups
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
Alexander Gessler 9538b7ed42 Merge pull request #570 from wise86-android/colladaExportLightAndCamera
Collada export light and camera
2015-05-23 12:06:23 +02:00
wise86Android 26b3328f3b fix xml syntax + more deap test 2015-05-23 11:03:56 +02:00
wise86Android 5ad6179bc5 export the light in the collada file 2015-05-19 23:15:18 +02:00
wise86Android b1d085b6a9 fix the foruma for compute the mAngleOuterCone values 2015-05-19 23:08:31 +02:00
wise86Android 2c194f629a fix macro for be uesed with expression 2015-05-19 21:57:51 +02:00
Andy Maloney 28cc934bb9 Fix overlapping merges 2015-05-18 09:51:09 -04:00
Kim Kulling 7cd8cc1b1f Merge pull request #560 from asmaloney/fixes/init_cleanup
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
Richard 9cbef8cba3 Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 20:50:58 -06:00
Richard cac8707121 Refactor: Delete unused field 2015-05-17 20:48:04 -06:00
Richard 4a5e9352d6 Refactor: Delete unused functions 2015-05-17 20:46:56 -06:00
Richard a34adb8450 Refactor: Delete unused functions 2015-05-17 20:45:16 -06:00
Richard 814ef32dce Refactor: Delete unused fields 2015-05-17 20:43:25 -06:00
Richard 5bb09377cb Refactor: Delete unused variable 2015-05-17 20:40:35 -06:00
Richard 7b3fa5ebc2 Refactor: Delete unused forward decls, delete unused function 2015-05-17 20:22:31 -06:00
Richard 79c916daf4 Refactor: Remove unused variable 2015-05-17 20:05:05 -06:00
Richard 2de6dd4973 Refactor: Delete unused variable 2015-05-17 20:02:58 -06:00
Richard 6ae9797648 Refactor: Initialize members in declaration order; initialize POD arrays 2015-05-17 20:01:51 -06:00
Richard d25c36960a Refactor: Initialize all POD members 2015-05-17 19:57:11 -06:00
Richard 8c94e51e90 Refactor: Delete unused functions 2015-05-17 19:47:13 -06:00
Richard fbf90a28ff Fixed: Ensure variable is always initialized before use 2015-05-17 19:46:01 -06:00
Richard 63520d562a Refactor: Initialize members in declaration order; prefer initialization over assignment 2015-05-17 19:42:30 -06:00
Richard bf4a73e42e Refactor: Remove unused member variable 2015-05-17 19:42:07 -06:00
Wil Shipley 91ca983d5f - Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines".
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
	- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
	- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
2015-05-17 18:36:17 -07:00
Andy Maloney c014bb977c - add missing initialization of several class members
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
wise86Android fb4eb83e84 add the ability to export cameras information in a collada file 2015-05-17 20:54:45 +02:00
shin_mbpr_late2013 98b234020b Fixed AssBin loader.
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
2015-05-16 23:39:24 +09:00
Alexander Gessler a1268bf864 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-12 21:52:25 +02:00
Alexander Gessler 0fe8e739c3 Use "wb" when writing binary STL exports, fixes #556. 2015-05-12 21:51:27 +02:00
Alexander Gessler e3c29b7e4b Merge pull request #554 from assimp/fix-obj-material-name-spaces
OBJ: Support spaces in material names, fixes #545.
2015-05-12 21:44:07 +02:00
Alexander Gessler faea2ecccc OBJ: Support spaces in material names, fixes #545.
Adding test file.
2015-05-10 23:50:18 +02:00
abma b4f5c57b3e allow to compile only enabled loaders 2015-05-06 23:15:15 +02:00
Kim Kulling 70722ad318 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-05 22:27:13 +02:00
Kim Kulling fd3a0d4a9d fix name handling of geoemtryobjectname nodes
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
Madrich b6d91ec11a Fix Path functions
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
Madrich 2dde962f0d FilePath Functions in DefaultIOSystems
Replacements in Exporters
2015-05-02 01:56:20 +02:00
Madrich 148207a073 Fix removed AssimpPCH 2015-05-01 23:16:44 +02:00
Madrich 71ae322e7b Merge pull request #5 from assimp/master
Update Fork
2015-05-01 23:01:33 +02:00
Madrich 58a72d9302 Fix Warnings
Add Time in Step File
2015-05-01 22:19:40 +02:00
Madrich ca8a3909be Add StepExporter.cpp(stp) Export
Fix XFile
2015-05-01 21:40:51 +02:00
Highlife1911 4acb1d4c92 Removed FORCE attribute from CMake variable LIBRARY_SUFFIX 2015-05-01 14:13:28 +02:00
Alexander Gessler 2a7e49423a Merge pull request #547 from assimp/acgessler-patch-2
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
Kim Kulling 5357772cf5 fix build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
Kim Kulling d5699cc89f fox build: add missing include for ai_assert.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
Kim Kulling 31cce98680 fix color handling in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
Alexander Gessler 78faabf0fa Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail. 2015-04-30 02:37:35 +02:00
Alexander Gessler 880cb473b0 Merge pull request #546 from terziman/master
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
Léo Terziman c99bd9825a Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...) 2015-04-29 18:13:16 +02:00
Kim Kulling 2f8f0b1b02 Merge branch 'master' of https://github.com/assimp/assimp
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
Kim Kulling 995bc41d57 color node handling opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
Léo Terziman ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman 91c751a03a Added missing header 2015-04-28 12:29:39 +02:00
Léo Terziman 5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
Alexander Gessler 5c890c1a90 Merge pull request #544 from aru/cygwin-build-fix
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
U-ORADEV\albihern 956fde6e66 Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin. 2015-04-20 17:49:02 -05:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Łukasz Twarduś 55ae853c2e Fix compilation with libc++ 2015-04-19 10:55:58 +02:00
Kim Kulling eb1ee61420 fix code reading findings: use of std::copy
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
Kim Kulling 68ca2ca427 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-18 19:17:19 +02:00
Kim Kulling 08886e28d7 use <> include bracket style.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
Alexander Gessler 27c6552ae8 Merge pull request #538 from cubeman99/master
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
David Jordan b38572d1bc std::fabs from cmath should be right 2015-04-17 23:50:14 -04:00
David Jordan b575acf2b6 std::absf to std::fabsf 2015-04-17 23:38:54 -04:00
David Jordan e86d40e4e2 Added infinity check for outputting PLY normals 2015-04-17 23:29:26 -04: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
Alexander Gessler f435712273 Fix Mac build issues (clang 6.0 compiling x86_64) 2015-04-17 06:42:58 +02:00
David Jordan f00101f496 Added include of qnan.h (now that AssimpPCH.h include was taken out) 2015-04-16 21:30:50 -04:00
David Jordan 3545d805d2 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 20:40:16 -04:00
David Jordan fa626aa855 Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND' 2015-04-16 18:01:24 -04:00
Kim Kulling d12868adc4 use correct type in forward declaration.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
Kim Kulling 97946e25c9 fix travis build
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
Kim Kulling e4b84ff48a fix mem leak.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
Kim Kulling 02ee002878 fix build for vs2013
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
Kim Kulling 444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling ead3e8d275 first version of material handling for opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
abma 1c1f3c25f8 awww, merge error 2015-04-16 03:13:19 +02:00
abma 611778045d fix for upstream changes 2015-04-16 02:55:41 +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
abma 470ad98281 fix "headercheck":
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
Kim Kulling 56e8dc5a43 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-14 12:04:47 +02:00
Kim Kulling 1899de6ea9 remove dead code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
Alexander Gessler 0cee21ce3c COB: code cleanup. 2015-04-13 21:52:09 +02:00
Alexander Gessler b3a3558da3 Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future. 2015-04-13 21:42:50 +02:00
ulf 28de609a56 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 16:02:02 +02:00
ulf 806d3ac8e1 - IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
Alexander Gessler e2f234707a Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401. 2015-04-12 19:53:24 +02:00
Kim Kulling ed57fac879 create node tree
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
Kim Kulling ecf390d51f set the correct reference to meshes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
Kim Kulling 22fc756d4a - fix double initialization.
- use correct number of vectors for dynamic array.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
Kim Kulling df1134b1a3 - initiate texture coordinate array.
- use correct number of vertices for vertex array,

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
Kim Kulling c0e3540ec1 use size_t instead of unsigned int ( static code analysis finding ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
Alexander Gessler 50d5c5c4ef Merge pull request #527 from VirusFree/pr_strtol10_64
fix for strtol10_64
2015-04-05 17:25:50 +02:00
Alexander Gessler 9a7f90220a Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
George Papadopoulos 54ce3d843f fix for strtol10_64 2015-04-05 16:40:40 +03:00
George Papadopoulos 6a1522ded8 [OpenGEXImporter] Correctly initialize m_textureCoords array 2015-04-05 16:29:33 +03:00
George Papadopoulos da3c347a57 add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime) 2015-04-05 15:19:55 +03:00
Kim Kulling 3fa6882384 generate unique indices for importes vertices in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
Kim Kulling a50fa5f1de add missing doc in obj importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +02:00
Kim Kulling 65cb05f381 fix invalid index counter.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-02 01:10:53 +02:00
Turo Lamminen 681c32d5ec AC3D: Throw DeadlyImportError when too many vertices instead of out-of-memory exception
Valgrind can't throw an exception when running out of memory. The program
wil just crash. This fixes it in some cases but not all.
2015-04-01 20:52:58 +03:00
Turo Lamminen bf5c9413f9 AC3D: Throw exception when encountering a bad vertex index 2015-04-01 16:22:46 +03:00
Turo Lamminen 16c57ab1d3 AC3D: Throw exception on too many vertices instead of crashing 2015-04-01 16:22:06 +03:00
Turo Lamminen 3e728e80eb Obj: Change asserts to exceptions
These can be triggered by malformed input file so they can't be assertions.
2015-04-01 16:13:46 +03:00
Turo Lamminen 4c28f31f43 X: Throw error when scene contains no root node
Otherwise MakeLeftHandedProcess will crash.
2015-04-01 16:11:53 +03:00
Turo Lamminen 8cdf9467c5 MD3: Fix assertion failures when filename doesn't contain '.' 2015-04-01 16:09:59 +03:00
Turo Lamminen 9f9774403d Remove assertion when too long message attempted
Since these can be caused by malformed input files assert is the wrong thing.
2015-04-01 16:03:06 +03:00
Kim Kulling 45cc0b582a fix creation of unused mesh instance.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-31 12:18:57 +02:00
Kim Kulling 754897d1aa add imported meshes from OpenGEX-importer to scene.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 23:54:32 +02:00
Kim Kulling 8857f26efb fix: add setup for number of copied vertex attributes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 12:04:28 +02:00