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
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
Kim Kulling
0fc5c9417c
export doc.# with '#' will be ignored, and an empty message aborts the commit.
2017-04-07 17:48:18 +02:00
Kim Kulling
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +02:00
Kim Kulling
069dbe6e9c
CMake: Fix compatibility check for so-version of the assimp lib.
2017-04-06 16:32:17 +02:00
Kim Kulling
76feb4e7bd
Merge pull request #1221 from mhereman/bugfix/clang_4.0
...
Fixed compiler error on clang 4.0 running on OSX
2017-04-03 12:49:00 +02:00
Maarten Heremans
8f3aaa88f9
Fixed compiler error on clang 4.0 running on OSX
...
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
(aka 'aiVector3t<float> *') and 'int')
if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +02:00
Kim Kulling
ea102e226d
Merge pull request #1220 from andre-schulz/fix-pdb-install-relwithdebinfo
...
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 22:14:55 +02:00
Andre Schulz
0f6782df27
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 16:03:01 +02:00
Galen Cochrane
0145eb866e
fixed cmake typo preventing use of assimp as submodule in builds that prohibit in-source changes
2017-03-31 07:56:49 -06:00
Kim Kulling
9f3154a5f3
Setup: Fix setup-script.
2017-03-30 21:15:51 +02:00
Kim Kulling
dfff37f724
X3D: add working example.
2017-03-29 21:13:44 +02:00
Kim Kulling
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +02:00
Kim Kulling
55595a7d18
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-29 20:56:55 +02:00
Kim Kulling
29b5d075e2
Closes https://github.com/assimp/assimp/issues/1205 : fix typo in docu.
2017-03-29 20:56:30 +02:00
Kim Kulling
1ab85f16ff
Merge pull request #1217 from Kai-W/master
...
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00
Kim Kulling
23c70c901e
Update Readme.md
2017-03-28 14:06:31 +02:00
Kim Kulling
57dad9940e
Update Readme.md
...
Add patron link to Readme.md.
2017-03-28 13:42:32 +02:00
Kim Kulling
8accf5b386
3MF: reformattings.
2017-03-28 00:35:56 +02:00
Kai Westerkamp
6c73cc8aff
Added ComponentType Unsigned int and Error handling
...
Part of GLTF 2.0 changes
2017-03-27 17:22:49 +02:00
aoowweenn
0a8966a3e6
add .pmx sample
2017-03-27 23:17:48 +08:00
aoowweenn
7bd3242563
comment out override specifier
2017-03-27 22:49:58 +08:00
aoowweenn
51dae22828
merge master and adjust assimp/DefaultIOSystem.h
2017-03-27 22:35:19 +08:00
aoowweenn
8cd0d3b3c7
change std::make_unique to mmd::make_unique
2017-03-27 22:16:19 +08:00
aoowweenn
ccf2bce2b0
correct offset matrix
2017-03-24 15:45:50 +08:00