v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,850 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

4850 Commits (bab6ca20856b1fab87680cb19103ccc3bc3527f7)

Author SHA1 Message Date
Jared Mulconry bab6ca2085 Upgraded zlib to 1.2.11.1 from the develop branch. 2017-10-04 20:33:59 +11:00
Kim Kulling c3e9d6132c Merge pull request #1468 from assimp/issue_1467 
closes https://github.com/assimp/assimp/issues/1467.
 2017-10-03 09:58:56 +02:00
Kim Kulling 6ec25be0a6 OpenGEX: improve logging to be able to detect error-prone situations. 2017-10-02 09:41:01 +02:00
Kim Kulling 3f4663e369 closes https://github.com/assimp/assimp/issues/1467. 2017-10-02 09:33:51 +02:00
Kim Kulling c202d43d8f Merge pull request #1466 from jaredmulconry/issue_1330 
Eliminated warnings when building the project with clang
 2017-10-01 20:03:30 +02:00
Kim Kulling 94860ff66e Merge pull request #1465 from turol/warnings 
Make Travis treat warnings as errors
 2017-10-01 20:01:24 +02:00
Turo Lamminen f7b2380f86 travis: Treat warnings as errors 2017-09-30 16:46:02 +03:00
Turo Lamminen 77ce6e562d Fix CMAKE option name 2017-09-30 16:46:02 +03:00
Turo Lamminen 45d93701f8 Open3DGC: Fix some uninitialized variable warnings 2017-09-30 16:45:53 +03:00
Jared Mulconry 9088deeb1d Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project. 2017-09-30 23:29:56 +10:00
Jared Mulconry a9e8836271 Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers. 2017-09-30 23:28:02 +10:00
Kim Kulling c4e91eb33f add some asserts. 2017-09-30 10:47:23 +02:00
Kim Kulling 1c76962c98 closes https://github.com/assimp/assimp/issues/1450: use correct name of exporter to gltf2 2017-09-30 09:38:13 +02:00
Kim Kulling 9033071237 Obj: rename attribute from exporter. 2017-09-30 09:37:34 +02:00
Kim Kulling 5adc029225 Merge branch 'master' of https://github.com/assimp/assimp 2017-09-29 21:59:11 +02:00
Kim Kulling c42589460d closes https://github.com/assimp/assimp/issues/1459: fix out-of-boundary access error 2017-09-29 21:58:58 +02:00
Kim Kulling 6ae35fb4d1 Merge pull request #1462 from jaredmulconry/issue_1330 
Fully addressed identifiable build warnings on gcc
 2017-09-29 16:48:30 +02:00
Jared Mulconry d28f45bfa8 Merge branch 'master' of github.com:assimp/assimp into issue_1330 2017-09-29 14:15:53 +10:00
Kim Kulling 87546ec54c Merge pull request #1461 from jfaust/master 
Fix possible infinite loop when exporting to gltf2
 2017-09-28 21:21:56 +02:00
Jared Mulconry 4feac1b1f9 Changed a couple more function interfaces to correct the input type. 2017-09-29 01:40:05 +10:00
Jared Mulconry 12b6895f7b Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table 2017-09-29 01:29:11 +10:00
Josh Faust febd611d48 Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars 2017-09-27 18:41:35 -07:00
Jared Mulconry e77e89c8b7 Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning. 2017-09-26 22:41:20 +10:00
Jared Mulconry 980d2b0eee Added a header to hold the file generation code for unit testing purposes. 2017-09-26 22:08:52 +10:00
Jared Mulconry d0ca143a3b Merge branch 'master' of github.com:assimp/assimp into issue_1330 2017-09-26 21:35:53 +10:00
Jared Mulconry e2ab3e0d29 Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next. 2017-09-26 21:32:11 +10:00
Kim Kulling b1410f8455 Merge pull request #1457 from jaredmulconry/issue_1330 
Partially address issue #1330
 2017-09-26 08:24:07 +02:00
Jared Mulconry 4360267cb2 Replaced flakey macros with specific functions to serve the purpose 2017-09-25 22:58:47 +10:00
Jared Mulconry f6fc5a7a11 Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc. 2017-09-25 22:07:01 +10:00
Jared Mulconry 7e91ac3443 Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types. 2017-09-25 20:22:06 +10:00
Jared Mulconry 79a5165106 Fixed unused variable warning by replacing them with descriptive comments 2017-09-24 21:46:15 +10:00
Jared Mulconry 8dabd76e03 Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested. 2017-09-24 21:19:03 +10:00
Jared Mulconry 539410d033 Fixed an error when compiling samples under MSVC that was caused by assuming including windows.h would pull in shellapi.h 2017-09-24 19:31:04 +10:00
Jared Mulconry 059a32654e Addressed warnings generated on MSVC across x86 and x64. 2017-09-24 19:29:43 +10:00
Kim Kulling b5ac248703 Merge pull request #1444 from turol/warnings 
Clean up some more GCC warnings
 2017-09-20 22:18:21 +02:00
Kim Kulling 81b94a1dca Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix 
Fix glTF2 alphaMode storage and reading
 2017-09-19 15:40:53 +02:00
Kim Kulling 5c44776532 Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix 
[gltf1] Don’t ignore rgba(1,1,1,1) color properties
 2017-09-19 15:40:00 +02:00
Kim Kulling adec1b2175 Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives 
glTF2 primitives fixes
 2017-09-19 15:39:11 +02:00
Kim Kulling d27e667f1e Merge branch 'master' of https://github.com/assimp/assimp 2017-09-19 00:32:50 +02:00
Kim Kulling af9596674d FBX: add missing inversion of postrotation matrix for fbx. 2017-09-19 00:31:41 +02:00
Daniel Hritzkiv 3e8955faf5
Don’t ignore rgba(1,1,1,1) color properties 
Do not ignore rgba(1,1,1,1) material properties when importing glTF1. While a white diffuse color may be the default value for a default assimp material, `1,1,1,1` is a very explicit color value for ambient/specular/emissive color properties.

Closes #1434
 2017-09-18 18:16:48 -04:00
Daniel Hritzkiv 798542d7bd
Formatting 2017-09-18 14:48:07 -04:00
Daniel Hritzkiv de0bf2ea96
Fix alphaMode storage and reading 
alphaMode is now converted from a std::string to an aiString and back to std::string, since aiString is easier to store and retrieve from aiMaterial properties than std::string

Fixes issues of alphaMode being written out as `\fOPAQUE\0\0\0\0\0\0…`
 2017-09-18 12:19:55 -04:00
Daniel Hritzkiv 8743d28ec5
SImplify mesh merging code 
My assumption that primitives of different types (modes) can’t be in the same mesh was incorrect.
 2017-09-18 12:16:30 -04:00
Daniel Hritzkiv 2efd2cdef8
tweaks to primitive merging logic; comments + formatting 2017-09-18 11:16:05 -04:00
Daniel Hritzkiv 814e8b3f8e
Formatting 2017-09-18 11:16:05 -04:00
Daniel Hritzkiv 28523232cf
Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node 
To do:
- clean up MergeMeshes
- see if there’s a way to do this earlier in the flow
 2017-09-18 11:16:05 -04:00
Daniel Hritzkiv 5147acfe65
Revert "store node mesh vs. meshes" 
This reverts commit a0d97505e5.
 2017-09-18 11:16:04 -04:00
Kim Kulling d473a49456 Merge pull request #1442 from jcowles/master 
Fix glTF 2.0 multi-primitive support
 2017-09-18 16:24:58 +02:00
Turo Lamminen 982430c3ce BlenderDNA: Silence warning about inline function which is declared but not defined 
It's a templated method which is meant to be specialized. The base version
is never called. Just remove 'inline' to make GCC shut up.
 2017-09-18 15:21:51 +03:00