Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
Kim Kulling
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
Kim Kulling
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
Kim Kulling
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
Kim Kulling
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
Kim Kulling
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
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
Tyson Grant Nottingham
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
Kim Kulling
f60f1544f7
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-19 19:57:56 +02:00
Kim Kulling
1a8b23712e
Unittests: add validation for TestIOSystem parameters.
2017-04-19 19:57:20 +02:00
Kim Kulling
4c348a6cdc
Merge pull request #1234 from heliocastro/html_output
...
Enable doxygen been properly used from cmake build and install.
2017-04-18 17:11:41 +02:00
Helio Chissini de Castro
e4f05064df
Enable doxygen been properly used from cmake build and install.
...
Current documentation lacks a proper directory handling and switch for
Unix like systems.
The option BUILD_DOCS are added as disable by default, even so the
Doxyfile file is generated for a manual build.
Option HTML_OUTPUT are made cached to be properly replaced, as usually
done by some Linux distributions
Microsoft CHM option is enabled if MSVC is detected.
2017-04-18 17:01:16 +02:00
Kim Kulling
c1d1dfadb3
Unittests: prepare ctest usage.
2017-04-17 21:25:57 +02:00
Kim Kulling
ad80f97930
closes github.com/assimp/assimp/issues/1228: use test extension for exported test files.
2017-04-17 14:26:54 +02:00
Kim Kulling
babb783336
Unittest: add missing test for ply-parser.
2017-04-17 14:15:33 +02:00
Kim Kulling
24f585b9aa
Merge pull request #1232 from asmaloney/fix-spelling
...
Fix spelling
2017-04-12 13:24:55 +02:00
Andy Maloney
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
Kim Kulling
cfe4ee0202
Merge pull request #1231 from samitc/master
...
fix line breakes in obj files
2017-04-11 19:14:00 +02:00
Amit Cirt
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
Kim Kulling
93b710c2aa
Merge pull request #1226 from gbittoun/master
...
Python wrapping improvements
2017-04-09 10:57:50 +02:00
Guillaume Bittoun
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
Guillaume Bittoun
910e0ddc5a
Adding a fallback to shader version 120 when version 130 failed to compile
2017-04-08 12:14:30 +02:00
Guillaume Bittoun
33bd5cfcfb
Installing assimp library as well
2017-04-08 12:14:30 +02:00
Kim Kulling
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
Kim Kulling
fac2f4d2f2
add missing doc.
2017-04-07 17:50:13 +02:00
Kim Kulling
53af3a5f95
add missing doc.
2017-04-07 17:49:59 +02:00
Kim Kulling
74b89e13f6
add missing doc.
2017-04-07 17:49:43 +02:00
Kim Kulling
0c43688108
add doc.
2017-04-07 17:49:26 +02:00
Kim Kulling
c4b5dc4275
add missing image.
2017-04-07 17:49:03 +02:00