Johannes Ebersold
0f40dcca7e
Add calculation for nuber of Primitives for TriStrips
2014-11-19 14:40:42 +01:00
Johannes Ebersold
7c4bf383d7
Move vertex copy operation into switch statement.
...
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
2014-11-19 14:40:42 +01:00
Johannes Ebersold
4ef244f672
Extract function ColladaParser::CopyPrimitive
2014-11-19 14:40:42 +01:00
Johannes Ebersold
70d2c8571b
ColladaParser::ReadPrimitives: get rid of "idx" iterator.
...
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
2014-11-19 14:04:49 +01:00
Johannes Ebersold
543bd5c0d0
ColladaParser::ReadPrimitives: rename "a" to currentPrimitive
2014-11-19 13:51:22 +01:00
Kim Kulling
7be4badd76
Merge pull request #413 from jdduke/fix_ns_obj_material
...
Support lowercase 'ns' and 'ni' obj material tokens
2014-11-19 10:23:20 +01:00
Jared Duke
c7b6b5ea2f
Support lowercase 'ns' and 'ni' obj material tokens
...
Previously, the obj material parser would interpret all key tokens
starting with 'n' as 'newmtl' tokens. However, there are other tokens
that can start with 'n', namely 'ns' and 'ni' for material properties.
Make the parser robust to such cases, despite their canonical forms
being uppercase.
Resolves #410 .
2014-11-18 16:56:46 -08:00
Kim Kulling
dbf9536213
bugfix: add correct handling for metric line end for example file.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 20:30:45 +01:00
Kim Kulling
1a5695ff48
update: add parsing of metric nodes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 19:01:04 +01:00
Kim Kulling
6843c42da1
update:
...
- merge master into branch
- fix metrix header parsing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-28 21:45:09 +01:00
Kim Kulling
f84589fec4
Merge branch 'master' into opengex_support
2014-10-24 15:24:32 +02:00
Kim Kulling
94f61300c2
bugfix:
...
- remove and comment some gcc compiler warnings for not used vaiables.
2014-10-23 21:02:43 +02:00
Kim Kulling
cee583db06
bugfix: fix compiler warning: converting double to float.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 23:05:25 +02:00
Kim Kulling
43dbd6d873
update: add some files to .gitignore.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 21:37:25 +02:00
Alexander Gessler
2d7ce22569
Merge pull request #405 from TimothyGu/patch-1
...
Correctly set Libs.private field in pkgconfig file
2014-10-15 00:52:55 -07:00
Timothy Gu
8656a35134
assimp.pc.in: Add static libs to Libs.private
2014-10-14 22:29:08 -07:00
Timothy Gu
060f3c33d9
CMakeList: Support setting Libs.private
2014-10-14 22:28:14 -07:00
Léo Terziman
940414104a
Merge remote-tracking branch 'official/master' into contrib
2014-10-13 14:10:11 +02:00
Alexander Gessler
b483be3069
Merge pull request #402 from jdduke/disable_bmesh
...
Temporarily disable Blender BMesh conversion
2014-10-10 22:46:25 -07:00
Jared Duke
a1a1bf77a8
Temporarily disable Blender BMesh conversion
...
Disable BMesh conversion while associated unresolved issues receive due
attention. Referencing #400 , #373 , #318 #315 and #132 .
2014-10-10 14:16:42 -07:00
Kim Kulling
487c9449d2
bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-10 15:59:42 +02:00
Kim Kulling
dad152e726
Merge pull request #399 from filipwasil/Android_JNI_Asset_extraction_support
...
Android JNI asset extraction support (API 9+)
2014-10-08 13:17:23 +02:00
Filip Wasil
88f6e8213b
Android JNI asset extraction support (API 9+)
...
- installation fixes
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 17:05:14 +02:00
Filip Wasil
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
Alexander Gessler
c967cf7af5
Merge pull request #396 from OgreTransporter/master
...
New boost versions
2014-09-27 20:06:22 -07:00
OgreTransporter
9b3a88b2a5
New boost versions
2014-09-27 21:04:57 +02:00
Kim Kulling
c2d13fbd76
Merge pull request #395 from Gargaj/patch-1
...
Null-terminate string
2014-09-26 19:30:47 +02:00
Gargaj
397989e169
Null-terminate string
...
In theory it shouldn't be necessary since the length is specified but there are parts like https://github.com/assimp/assimp/blob/master/code/MaterialSystem.cpp#L74 that depend on it.
2014-09-26 01:29:23 +02:00
Kim Kulling
a5afbcf29c
refactoring: remove duplicate code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-23 23:34:05 +02:00
Alexander Gessler
d228dbeab7
Merge pull request #394 from abma/master
...
use std:: namespace for most cmath functions:
2014-09-22 16:12:36 -07:00
abma
775b26e614
use std:: namespace for most cmath functions:
...
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
Kim Kulling
b359deb7fd
update:
...
- add assert test in obj-import
- fix material token in Obj.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-21 20:37:36 +02:00
Alexander Gessler
e6eeab8c84
Merge pull request #388 from jdduke/rebase_blend_regression_db
...
Rebase BLEND regression db entries
2014-09-20 23:27:18 -07:00
Alexander Gessler
f44968669f
Merge pull request #391 from jdduke/fix_blend_bmesh_uvloop
...
Use strict inequality when validating BMesh uvloop access
2014-09-20 23:26:35 -07:00
Jared Duke
4dcd316430
Use strict inequality when validating BMesh uvloop access
...
Change the inequality to a strict inequality when validating
BMesh uvloop access during face conversion.
2014-09-20 10:23:21 -07:00
Jared Duke
5e114c04d2
Use Linux/GCC build for DB generation
2014-09-17 08:49:28 -07:00
Jared Duke
083d5630ef
Use VC11 build for DB generation
2014-09-17 07:30:55 -07:00
Jared Duke
c8661ab055
Rebase BLEND regression db entries
...
Now that .blend import works properly for non-BMesh-containing meshes,
all .blend regression test cases should now succeed. Rebase accordingly.
2014-09-16 17:47:55 -07:00
Alexander Gessler
6a8f69ad5d
Merge pull request #386 from jdduke/rebase_fbx_fov
...
Rebase FBX regression db entries
2014-09-16 09:37:37 -07:00
Denis
1add165319
Merge pull request #1 from assimp/master
...
Merge with assimp:master
2014-09-16 12:30:43 +04:00
Alexander Gessler
aac40dd5b8
Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests
...
Fix non-BMesh-containing .blend import
2014-09-16 01:10:53 -07:00
Alexander Gessler
f7f906ec70
Merge pull request #387 from Kvalme/master
...
Fix gcc warnings. (initialization order)
2014-09-16 01:09:55 -07:00
Jared Duke
046b7e5f47
Rebase FBX regression db entries
...
The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
2014-09-15 18:14:38 -07:00
Jared Duke
c482458cae
Fix non-BMesh containing .blend import
...
BlenderBMeshConverter was erroneously asserting that it contained valid
mesh upon construction. The assertion should only occur when
triangulation is requested, allowing non-BMesh blender meshes to load
properly.
Note that this fixes a number of .blend regression tests that are
currently baselined as failures.
2014-09-15 17:19:33 -07:00
Denis Biryukov
ab6b5a7b21
Fix gcc warnings. (initialization order)
2014-09-15 23:35:03 +04:00
Alexander Gessler
f2d26222fc
Merge pull request #383 from jdduke/blender_fix_uv_conversion
...
Fix crash for Blender poly to face conversion without UVs
2014-09-13 14:47:51 -07:00
Jared Duke
35c9a33718
Fix crash for Blender poly to face conversion without UVs
...
BlenderBMeshConverter assumes that the BMesh has UVs, but that is not
always the case. Handle the non-UV case by only adding a T face when
UVs are present.
2014-09-13 09:43:00 -07:00
Alexander Gessler
875e65a86a
Merge pull request #381 from jdduke/fix_bsp_null_check
...
Fix null check in Q3BSPFileImporter
2014-09-12 23:08:56 -07:00
Jared Duke
485aa8b39d
Fix null check in Q3BSPFileImporter
...
Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380 .
2014-09-12 19:37:10 -07:00
Kim Kulling
db582ee024
bugfix: replace nullptr with NULL:
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 18:12:18 +02:00