186f3f091f
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling
2016-10-29 20:07:53 +02:00
8bae6ad7b7
Add missing license info.
2016-10-29 19:11:00 +02:00
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
8e8757f800
Keep original materials names after RemoveRedundant materials process and export to collada
2016-10-27 19:23:43 +02:00
949a27a743
New streaming interface: fix build.
2016-10-22 23:34:56 +02:00
54c5acd02d
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-22 22:15:00 +02:00
79504c08d9
QtViewer: fix review findings.
2016-10-22 22:14:01 +02:00
cbe2e9af49
Merge branch 'master' into new_obj_stream_handling
2016-10-22 21:04:02 +02:00
d3a3bd9c12
BUgfixes regarding filepos setupBUgfixes regarding filepos setup.
2016-10-22 21:03:11 +02:00
33e370a8b7
Obj-Stream-Handling: fix readin of linewise import.
2016-10-21 21:14:35 +02:00
1724cc9e66
Remove redundant file.
2016-10-21 19:44:31 +02:00
50803b897c
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-21 19:43:56 +02:00
3b61ff4cf2
Qt5-based Viewer: fix build.
2016-10-21 12:50:41 +02:00
fe0cfc52bc
Q3BSP-Loader: reformat include.
2016-10-20 22:25:39 +02:00
af54cb8a29
Q3BSP: fix license dates.
2016-10-20 17:04:37 +02:00
6a31e3528e
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-20 16:43:38 +02:00
91e833056e
Q3BSP-Importer: remove commented code.
2016-10-20 16:42:00 +02:00
b0f09ee6e2
Merge pull request #903 from dontbmh/upstream
...
fix strncpy not null terminated string
2016-10-20 16:18:30 +02:00
74ab4afd01
Merge pull request #1042 from VeganPower/Fix_988
...
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-19 16:03:53 +02:00
bac28061ea
3MF: fix nullptr access.
2016-10-18 21:16:44 +02:00
8fd030f23d
Merge pull request #1040 from johnmaf/bugfix/obj-mtllib-parse
...
Fix OBJ parser mtllib statement parsing bug.
2016-10-18 17:09:06 +02:00
acd2802f22
Check for std::string::npos before applying std::string::substr
2016-10-18 10:48:47 -04:00
a54e42cb5a
Some more fixes.
2016-10-18 14:02:58 +02:00
4b15dfd9af
Fix OBJ parser mtllib statement parsing bug.
...
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
2016-10-17 18:48:04 -04:00
5cd16a0aa6
Merge pull request #1034 from ascandal/feature/gltf-compact-skins
...
glTF compact skins
2016-10-17 21:45:50 +02:00
ea0424de18
Merge pull request #1037 from ystreet/cfileio-leaks
...
cfileio: fix leaks by not closing files in the destructor
2016-10-17 17:29:38 +02:00
fe1af5af7d
Merge pull request #1038 from ystreet/cfileio-defs
...
cfileio: fix function typedefs to have struct/enum
2016-10-17 17:28:04 +02:00
862dfd5a05
Merge pull request #1032 from ashdnazg/master
...
use cmath and C++ (std::) versions of math functions
2016-10-17 17:26:32 +02:00
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
6ed1bcd41b
cfileio: fix function typedefs to have struct/enum
...
Otherwise building with cfileio.h would result in:
/usr/include/assimp/cfileio.h:61:58: error: unknown type name ‘aiOrigin’
typedef aiReturn (*aiFileSeek)(C_STRUCT aiFile*, size_t, aiOrigin);
^~~~~~~~
/usr/include/assimp/cfileio.h:64:9: error: unknown type name ‘aiFile’
typedef aiFile* (*aiFileOpenProc) (C_STRUCT aiFileIO*, const char*, const char*);
^~~~~~
/usr/include/assimp/cfileio.h:122:5: error: unknown type name ‘aiFileSeek’
aiFileSeek SeekProc;
^~~~~~~~~~
2016-10-18 00:20:28 +11:00
09ad67f469
3MF-Importer: remove unused variable.
2016-10-16 17:14:22 +02:00
6ce2a37b82
merge upstream/master and fix conflicts
2016-10-15 18:12:02 -07:00
fcf2d6357e
check if bones exist before creating skin
2016-10-15 17:21:55 -07:00
5cb4df80ad
C++11-combat: hopefully the last std::to_string to replace.
2016-10-15 21:45:58 +02:00
46d78f57d5
OpenGEXImporter: fix compiler warning.
2016-10-15 21:45:09 +02:00
7681089abc
C++11-Combat: last replacements of std::to_string.
2016-10-15 21:30:02 +02:00
e0dde73018
C++11-combat: replace more std::to_string by assimp-specific to_string
2016-10-15 21:25:16 +02:00
b90669c45e
C++11: Replace std::to_string by assimp-specific implementation.
2016-10-15 20:36:51 +02:00
a84bf869c2
replace more math.h functions occurences with std::
2016-10-15 12:05:57 +03:00
c43ab39670
Merge pull request #1033 from ashdnazg/fix_mingw
...
Fix mingw build (mingw supports stat64 nowadays)
2016-10-15 07:51:19 +02:00
3b6ffc3ef5
fix mingw build (mingw supports stat64 nowadays)
2016-10-15 03:52:50 +03:00
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
9c4bb1c9bc
find the correct index in jointNames
2016-10-14 15:47:21 -07:00
2505f02263
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-14 17:47:10 +01:00
1c03aebfb8
test combining skins
2016-10-13 19:49:59 -07:00
084a6f6415
Obj-Streaming: add new io-stream for line-wise cached reading + first
...
bugfixes.
2016-10-12 15:30:04 +02:00
dc1e11c8be
added some comments
2016-10-11 15:33:52 -07:00
57a00d5faa
find skeleton root joint and only allow four joint weights per vertex
2016-10-11 15:28:04 -07:00
ccf32aaf57
Merge pull request #1029 from samitc/master
...
fix bug when reading strings in quote in MD5 models
2016-10-11 13:48:24 +02:00
905e48a35c
Buffered stream API for big files: add next try of a prototype.^
2016-10-11 12:29:40 +02:00
Kim Kulling
tomacd
Kim Kulling
John Senneker
Matthew Waters
Angelo Scandaliato
Eshed
Rosario Leonardi