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

4380 Commits (428a4cdd716bef4104b5d0934848944e4bb8d441)

Author SHA1 Message Date
Kim Kulling 428a4cdd71 SpatialSort: use std::vector::clear(). 2017-05-15 19:41:08 +02:00
Alexander Gessler ab45dc79fa Merge pull request #1263 from jamesgk/gltf-export 
GLTF exporter: convert animation time from ticks to seconds
 2017-05-15 09:12:57 +02:00
Alexander Gessler 24790398b9 Merge pull request #1264 from smokris/master 
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
 2017-05-15 00:39:36 +02:00
Alexander Gessler cd7cc2e58c Merge pull request #1267 from VennGrayDog/b1 
Fix location of config.h
 2017-05-15 00:39:05 +02:00
VennGrayDog 3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Steve Mokris 2e455b78c8 Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'. 2017-05-11 15:21:37 -04:00
jamesgk c33039d682 GLTF exporter: convert animation time from ticks to seconds 2017-05-11 11:04:23 -07:00
Kim Kulling 9b2671b280 Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue 
Fixed no member named 'atop' in global namespace issue for Android ND…
 2017-05-11 10:55:59 +02:00
Kim Kulling ab19c5e3f7 Merge pull request #1258 from jamesgk/gltf-export 
GLTF exporter: ensure animation accessors have same count
 2017-05-11 10:46:06 +02:00
Kim Kulling f6a8be5bac AMPImporter: fix coverity findings. 2017-05-10 19:34:50 +02:00
Kim Kulling 5411f769e8 STEPFile: fix coverity findings. 2017-05-10 18:50:51 +02:00
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
jamesgk 36f4fb8826 GLTF exporter: ensure animation accessors have same count 2017-05-08 14:45:26 -07: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 d02a4c36a9 Mesh: fix coverity finding. 2017-05-06 11:08:57 +02:00
Kim Kulling c1b56715fe Mesh: fix coverity bug. 2017-05-06 11:04:40 +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
Kim Kulling 82e213fb7c Merge pull request #1252 from a-day-old-bagel/master 
Shouldn't the configured "config.h" file be going into the binary directory?
 2017-05-02 20:07:08 +02:00
Kim Kulling e21c1a8ec4 Merge pull request #1255 from heliocastro/fpic_fix 
Add missing CFLAGS -fPIC.
 2017-05-02 20:06:08 +02:00
Helio Chissini de Castro 0c4c1270ac Add missing CFLAGS -fPIC. 
This entry was missing due revert of CMAKE_POSITION_INDEPENDENT_CODE
usage. Reported by @Sailsman63
 2017-05-02 16:48:49 +02:00
Kim Kulling b93df233e3 Merge pull request #1253 from rdb/master 
Fix static init ordering bug in OpenGEX importer
 2017-05-02 11:03:59 +02: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
Kim Kulling 3f361ecc1f Merge pull request #1247 from rspencer01/master 
Adds texture type enum to pyassimp
 2017-05-01 10:56:34 +02:00
Kim Kulling 678fc45100 Merge pull request #1250 from heliocastro/irrxml 
- Apply mechanism to decide use for IrrXML external or internal
 2017-05-01 10:56:00 +02:00
Galen Cochrane 3e5e3a54b9 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-29 15:10:35 -06:00
Helio Chissini de Castro 6f00ca558d Group libstdc++ entry in the compiler optionas as well 2017-04-29 08:44:58 +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
Kim Kulling 79e582abca Update Readme.md 
Update patreon button.
 2017-04-28 19:30:21 +02:00
Kim Kulling 8218586d6d Update Readme.md 
Fix typo
 2017-04-27 16:59:33 +02:00
Cong Jie aff391c681 Fixed no member named 'atop' in global namespace issue for Android NDK compilation 2017-04-27 17:15:03 +09:00
Kim Kulling c264df50f3 Merge pull request #1246 from heliocastro/fix_docinstall 
- Fix documentation install process.
 2017-04-26 20:33:13 +02:00
Robert Spencer 28da8c643d Adds texture type enum to pyassimp 
Keeping the same style of `postprocess.py`, this is a port of the aiTextureType enum in [`material.h`](https://github.com/assimp/assimp/blob/master/include/assimp/material.h).
 2017-04-26 15:05:45 +02:00
Helio Chissini de Castro 1ba843118b - Fix documentation install process. It's nonsense second BUILD_DOCS 
check on doc/CMakeLists since is already checked on main CMakeLists.
At same time, Doxygen becomes required as no documentation can be built
without it.
Output directory now uses the user defined HTML_OUTPUT instead of
forced dir.
- Added included GNUInstallDirs on same UNIX check, avoiding duplication
of checks
 2017-04-25 14:35:07 +02:00
Kim Kulling b30c6282f7 Merge pull request #1239 from tgnottingham/master 
Set UVW index material properties for OBJ files.
 2017-04-22 14:22:29 +02:00