f8b79acb36
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 10:25:04 +02:00
1ec72cdddb
Release candidate 2 : 3.1
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 19:17:51 +02:00
392730be07
bugfix: export processes for unittests.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 16:02:52 +02:00
9ad74e461e
OgreImporter: Added brackets for all conditional etc. statements, even when there is a single line as requested by @kimkulling. I'm still not sure about the coding convention but looked for guidance in the obj importer code. Now newline before { if only one line and no else/else if after it, othewise a newline before it.
2014-05-03 00:20:17 +03:00
22a4215c06
OgreImporter: Remove unnecessary comments.
2014-05-02 01:54:42 +03:00
dcf6002bed
Try fix travis ci produced build errors on gcc and clang.
2014-05-02 01:38:13 +03:00
409c2cf332
OgreImporter: One more function cleanup.
2014-05-02 00:56:35 +03:00
283394d695
OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now.
2014-05-02 00:28:14 +03:00
f5c7b283bc
OgreImporter: Cleanup and bugfixes to OgreSkeleton.cpp. This was actually so badly broken that it did nothing if the mesh referenced a binary skeleton. Now logs a warning for this case and tries to read from .skeleton.xml like the original author intended it to work. The assimp skeleton is still broken, I will fix that later on when I (eventually) get to that part of the code.
2014-05-02 00:28:13 +03:00
45715df263
OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places.
2014-05-02 00:28:12 +03:00
fcb97bb595
OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file.
2014-05-02 00:28:12 +03:00
f98584cdea
OgreImporter: Remove unnecessary m_currentX state. Improve and clean OgreMaterial: split tech/pass/texture_unit to their own functions. Document missing features and potential bugs. Improve the original authors 'detection from texture filename' logic (enabled with AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME). Add generic detection from texture unit name, which is commonly used in Ogre materials.
2014-05-02 00:28:10 +03:00
6c51fa2072
OgreImporter: Continue cleanup.
2014-05-02 00:28:09 +03:00
09517b342b
OgreImporter: Started cleanup and refactoring. Aim is to get this into a shape that its easy to read and understand before I start making any new features.
2014-05-02 00:28:09 +03:00
825a61fbc0
update:
...
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-01 11:32:15 +02:00
d1886daf5a
Merge branch 'master' of https://github.com/assimp/assimp
2014-04-29 00:06:14 +02:00
fbaf89492d
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-04-29 00:04:54 +02:00
7c3a039349
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
include/assimp/matrix4x4.inl
include/assimp/vector2.h
include/assimp/vector3.h
2014-04-22 14:32:59 +02:00
129e4318e6
Merge pull request #255 from xantares/master
...
mingw|cmake fixes
2014-04-22 08:49:59 +02:00
25c2dd58de
fix: smoothed normal qnan handling & more stable smoothed normals for imprecise geometry w/ long thin faces
2014-04-21 23:12:51 +02:00
0a01da7242
fix: optimize meshes when vertex & primitive format final
2014-04-21 22:52:50 +02:00
8699021f17
fix: OptimizeMeshes w/o SplitLargeMeshes was disabled due to obscure max_verts = 0 assignment
2014-04-21 22:40:48 +02:00
0e62405406
use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw)
2014-04-21 21:36:33 +02:00
aae01c47ad
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
a6044e125e
Merge pull request #249 from attila-barsi/master
...
Initial version for FBX layered textures.
2014-04-01 16:02:16 +02:00
4f36e85bd8
Added required changes to doc and protection from nullptr.
2014-03-31 10:30:04 +02:00
38de6a658d
bugfix:
...
- fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 20:33:08 +01:00
2e3b602c0b
Aspect Ratio fix, and comment about field of view.
2014-03-26 16:44:49 -05:00
ed9204ab1b
Initial version for FBX layered textures.
...
Fixed assert during parsing UDP3DSMAX.
2014-03-24 11:46:36 +01:00
1f3be52079
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
2dd6726c02
Changed order of some post processing steps in order to switch coordinate system as early as possible because pretransform now accept external matrices for the root transformation & this matrice should imperatively be in the same system coordinates as the rest of assimp structures
2014-03-24 10:43:07 +01:00
358819c1a0
Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example)
2014-03-20 15:32:12 +01:00
331158e410
Merge pull request #237 from frederikaalund/master
...
Added support for heterogenous metadata on aiNode
2014-03-20 02:23:07 -04:00
e9fa779a65
Fixed error when compiling with mingw
2014-03-19 15:45:12 +01:00
82cc038a83
Merge remote-tracking branch 'official/master' into contrib
2014-03-19 10:18:47 +01:00
7d1a704ed7
saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE
2014-03-16 21:30:10 +01:00
595529ef8b
Refactored the metadata for inner consistency.
2014-03-15 08:37:45 +01:00
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
8fad549649
Merge remote-tracking branch 'official/master' into contrib
2014-03-10 17:21:26 +01:00
77263c631f
Fixed unzip support to use IOSystem/IOStream abstraction
2014-03-10 17:21:17 +01:00
29e3b82238
Fixed some header files in CMakeLists
2014-03-10 17:20:14 +01:00
f65e5d5487
Fixed a compile error due to a >> expression in a nested template statement.
2014-03-09 17:04:27 +01:00
9eb8677aba
Added unparsed FBX properties to the aiNode's metadata. This allows the
...
user to extract extra/custom/user attributes/properties from the scene
graph. E.g., extracting attributes set under "extra attributes" in Maya.
2014-03-09 16:18:05 +01:00
84b66092d7
Merge pull request #217 from lousyphreak/master
...
Fix 3DS instances loading, fixes #151
2014-03-06 00:07:33 +01:00
34882177a9
bugfix: install_name should be set to absolute path to installed library in macosx build #226
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-06 00:06:19 +01:00
ec2b8dd3fa
bugfix:
...
add handling for special cases for the uv-calculation:
- When 3 vector have same UV, using default UV direction:
- When 2 vector have same UV, recalculate tangent/bitangent according to normal and bitangent/tangent.
Thanks to Ya ping Jin.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-05 23:25:49 +01:00
172c917c37
Merge remote-tracking branch 'official/master' into contrib
2014-03-03 12:47:45 +01:00
5c95848f51
Merge pull request #224 from VirusFree/master
...
[FBX] Do not rename null nodes. Preserve information in node metadata.
2014-03-02 10:41:28 -05:00
08324b8095
fix miss commit at 8e35ea59d5
2014-03-01 20:34:57 +09:00
f54c85d4e6
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
Léo Terziman
Kim Kulling
Jonne Nauha
tszirr
xantares
attila-barsi
DoubleLee
Alexander Gessler
Judith Hartmann
Frederik Aalund
YoheiKakiuchi