Commit Graph

4441 Commits (e93355c8b435046e6157681ff4fe626ce67c0a84)

Author SHA1 Message Date
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
aoowweenn 59b48fb960 finish skin controller 2017-03-24 14:39:34 +08:00
aoowweenn 968612fea1 testing2 2017-03-24 12:04:40 +08:00
Kim Kulling 63485bdd26 Merge pull request #1214 from assimp/issue_1211
closes https://github.com/assimp/assimp/issues/1211: defensice handling
2017-03-23 20:36:01 +01:00
Kim Kulling 1ca54c0b2f closes https://github.com/assimp/assimp/issues/1211: defensice handling
of utf-8 decode issues.
2017-03-23 17:11:52 +01:00
aoowweenn 314bb451bb testing weights, still strange 2017-03-23 16:30:01 +08:00
aoowweenn f10f2f5814 Almost finish vertex weghts 2017-03-23 04:33:53 +08:00
Kim Kulling 1c525a9365 Merge pull request #1208 from terziman/master
Added parameters to IFC importer to control tessellation
2017-03-22 20:08:21 +01:00
aoowweenn 845d206959 Fill in mParent for each node in Assbin Loader 2017-03-22 21:11:17 +08:00
aoowweenn 5bf974ae3b keep writing dae skinning 2017-03-22 17:06:55 +08:00
Kim Kulling eb8b00617a Merge pull request #1210 from rmitton/sib-normals
Fix for faceted normals in SIB files
2017-03-21 14:31:34 +01:00
aoowweenn e5a3038abd try to fill in vertex weights to dae exportor 2017-03-21 16:21:49 +08:00
rmitton d1c7d905e8 Fixed infinite loop on non-manifold geometry
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
2017-03-19 13:46:23 -07:00
rmitton 209e972762 Fixed faceted normals in SIB importer. 2017-03-18 14:52:48 -07:00
Leo Terziman bf2e2f7537 Extended support for tessellation parameter to more IFC shapes 2017-03-17 14:55:18 +01:00
Leo Terziman d4ead31c18 Merge remote-tracking branch 'github/master' into contrib 2017-03-17 12:13:52 +01:00
Leo Terziman 9ef234b842 Added parameter to control cylindrical shapes tessellation
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
Leo Terziman fff0e886a1 Fixed bug in IFC openings when curmesh.vertcnt is empty 2017-03-17 11:53:36 +01:00
Kim Kulling a182faacbf Merge pull request #1207 from Celli119/matrixOperators
operators to add and multiply by floats
2017-03-17 09:33:41 +01:00
girinon 78a58ef5f0 operators to add and multiply by floats 2017-03-16 12:03:04 +01:00