7ec690adfa
Merge pull request #258 from g-pechorin/patch-1
...
XML filename tweaks
2014-04-22 13:27:33 -04:00
4d2c7f116d
XML filename tweaks
...
This change encodes the XML strings for scenarios involving `&` et al in material file names
2014-04-22 16:33:11 +01: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
b5eb13dd58
Merge pull request #257 from tszirr/dev
...
Better smoothed normals & deferred OptimizeMeshes step
2014-04-22 01:40:50 -04:00
ed0c48075f
Merge branch 'master' into dev
...
Conflicts:
code/GenVertexNormalsProcess.cpp
2014-04-21 23:37:32 +02:00
51cb2c042c
fix: want to add if NOT qnan
2014-04-21 23:20:34 +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
f48c8eccce
Fix for issue #177 with mingw
2014-04-21 21:58:29 +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
a0ba3a8ade
Merge pull request #253 from g-pechorin/master
...
fixed "<Colors ...> ... </Color>" typo
2014-04-15 19:34:31 +02:00
73e6908c36
fixed "<Colors ...> ... </Color>" typo
...
The XML tags did not match. Mismatched tags confuse XML parser kits. So I fixed the tags to match.
2014-04-15 15:10:48 +01:00
85b756ad4d
Merge pull request #251 from jmas-ogawa/pr-work
...
Fixed half-width from the full-width double quotes.
2014-04-15 11:42:29 +02:00
da1c9e8434
Fixed half-width from the full-width double quotes.
2014-04-14 23:04:36 +09: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
f9d5852ef9
bugfix:
...
- add global namespace statement to sqrt.
refactoring:
- include cmath instead of math.h in c++ API.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 19:19:25 +01:00
e97787aa5c
Merge pull request #246 from DoubleLee/master
...
Aspect Ratio fix, and comment about field of view.
2014-03-27 16:12:47 +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
ed586a35ae
Fixed compilation error when using swig
2014-03-24 11:24:27 +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
7fc15c3713
Merge pull request #242 from Seed-Of-Hate/master
...
iOS-SDK 7.1 Updated Toolchain
2014-03-21 15:13:33 +01:00
050b38a69f
Readme and cosmetics
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:25:35 -07:00
aa8bdba920
Merge branch 'master' of https://github.com/Seed-Of-Hate/assimp
...
Mistake
2014-03-20 17:15:38 -07:00
73c482a293
iOS Path Update
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:15:09 -07:00
81cc2c5de3
Update README.md
2014-03-20 17:11:46 -07:00
dd6a624f15
iOS Toolchain Readme
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:27:49 -07:00
2dc5a46e99
Zombie Removal
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:25:07 -07:00
9f4623bec7
iOS Toolchain Update
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:21:28 -07: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
897fcc7328
Merge pull request #239 from judithhartmann/master
...
Load and save Ke-Value of mtl-Files
2014-03-17 13:39:22 +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
9b78a180d9
Added a convenience overload for aiMetadata::Get using std::string as key.
2014-03-14 17:12:22 +01:00
56f37a0465
Deprecated some abstraction and fixed a memory leak.
2014-03-14 15:36:12 +01:00
fc39fe9f40
Fixed a compile error involving unnecessary enum resolution qualification.
2014-03-14 15:01:36 +01:00
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
9af1dfd48d
Merge pull request #231 from frederikaalund/master
...
Added unparsed FBX properties to the aiNode's metadata.
2014-03-11 00:07:50 -04:00
5adb6c6cda
Merge pull request #232 from autosquid/master
...
for python binding to work on mac '.dylib' should be added to ext_whitelist
2014-03-11 00:01:43 -04:00
fd4f7f4572
for python binding to work on mac
...
add dylib to ext_whitelist for posix system
2014-03-11 00:34:49 +08:00
8fad549649
Merge remote-tracking branch 'official/master' into contrib
2014-03-10 17:21:26 +01:00
Alexander Gessler
Peter LaValle
Léo Terziman
Kim Kulling
tszirr
xantares
jmas-ogawa
attila-barsi
DoubleLee
shaded enmity
Seed-Of-Hate
Judith Hartmann
Frederik Aalund
autosquid