Kim Kulling
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
Kim Kulling
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
Kim Kulling
7f014ea889
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
...
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
John Senneker
d6e8fd34f0
Search for .gltf extension at end of file name for buffer prefix.
...
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
Amit Cirt
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
Amit Cirt
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
rdb
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
Helio Chissini de Castro
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Cong Jie
aff391c681
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
2017-04-27 17:15:03 +09:00
Tyson Grant Nottingham
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
Andy Maloney
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
Amit Cirt
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
Guillaume Bittoun
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
Kim Kulling
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
Kim Kulling
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +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
Andre Schulz
0f6782df27
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 16:03:01 +02:00
Kim Kulling
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +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
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
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
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
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
aoowweenn
0eecff74d8
correct node hierarchy
2017-03-16 01:25:53 +08:00
Kim Kulling
2cd6c3d755
Closes https://github.com/assimp/assimp/issues/1128 : do not use non
...
verbose format flag for import.
2017-03-14 19:01:41 +01:00
aoowweenn
0231af4343
skeleton almost done
2017-03-14 02:01:26 +08:00
Kim Kulling
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
Kim Kulling
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
Kim Kulling
b47bfeb0d7
StringUtils: add the right missing header.
2017-03-11 17:25:34 +01:00
Kim Kulling
6179e22749
StringUtils: add missing include for VS2012 & 2013
2017-03-11 11:34:23 +01:00
Leo Terziman
8bc183182c
Added new option to IFC importer to control tessellation angle
...
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
aoowweenn
2d3dd1d40f
use SkeletonMeshBuilder to show bone positions.
2017-03-10 17:15:01 +08:00
Kim Kulling
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
Kim Kulling
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
aoowweenn
c0c480a4cb
fixup! merge master and mv FindDevIL to cmake-modules
2017-03-05 23:36:36 +08:00
aoowweenn
83db3fc084
fixup! remove dependency of ICU library
2017-03-05 23:14:21 +08:00
aoowweenn
7226d73682
merge master and mv FindDevIL to cmake-modules
2017-03-05 23:07:06 +08:00
aoowweenn
34906071fc
remove dependency of ICU library
2017-03-05 22:59:53 +08:00
Kim Kulling
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
Kim Kulling
e6dcad384a
Fix missing includes.
2017-03-05 15:05:40 +01:00
aoowweenn
0c0ca403b5
Convert to OpenGL space by three processes.
2017-03-05 20:40:41 +08:00
aoowweenn
7a25f5ac25
finish UV texture
2017-03-02 23:16:29 +08:00
Shin-ya Murakami
ffc95162ec
fix for FreeBSD
2017-03-01 16:30:03 +09:00
aoowweenn
e89c29a9cc
finish vertex
2017-03-01 13:52:46 +08:00
Kim Kulling
a38b2fb10f
Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist
...
Allow to enable importers in a whitelist manner
2017-03-01 00:34:10 +01:00
Kim Kulling
9a0a74ef1f
Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
...
Fix buildsystem minizip
2017-03-01 00:15:12 +01:00
Kim Kulling
574c192575
Merge pull request #1186 from astillich/ase_cface
...
Fixed parsing ASE MESH_CFACE
2017-03-01 00:12:12 +01:00
Kim Kulling
f312d8709e
More cleanup
2017-02-28 16:37:07 +01:00
Antoine Bolvy
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
Antoine Bolvy
d77989088c
Allow to enable importers in a whitelist manner
2017-02-28 11:42:53 +09:00
Antoine Bolvy
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05:00
Kim Kulling
7a47f1f8f7
Issue-1183: add stp to the list of supported extensions for step-files.
2017-02-27 20:11:59 +01:00
UMW
e80d3aa9d4
finish mesh creation
2017-02-27 21:02:58 +08:00
Alexander Stillich
0700dfe711
Fixed parsing ASE MESH_CFACE
2017-02-25 23:30:41 +01:00
aoowweenn
4045466f73
pass through but panic
2017-02-24 08:35:15 +08:00
Kim Kulling
5e2c846ca0
Remove unused header.
2017-02-22 17:22:23 +01:00
Kim Kulling
ef540f46a3
Remove unused headers.
2017-02-22 17:20:26 +01:00
Kim Kulling
a75fa44bde
PLY: prepare bugfix by adding missing unittest.
2017-02-11 14:19:34 +01:00
Kim Kulling
615bdb27d9
Closes https://github.com/assimp/assimp/issues/1102 : update Version.cpp
2017-02-11 13:49:48 +01:00
Kim Kulling
6ed1f7570e
Merge branch 'master' of https://github.com/assimp/assimp
2017-02-05 19:30:11 +01:00
Kim Kulling
31bb9f7ba6
Obj: fix code review findings.
2017-02-04 18:32:04 +01:00
Kim Kulling
11e2ca173d
Fix the build.
2017-02-04 18:15:50 +01:00
Kim Kulling
692fb216f7
closes https://github.com/assimp/assimp/issues/809 : add vertex color
...
export support.
2017-02-04 14:51:23 +01:00
Kim Kulling
f9fa95a7c2
Obj-Importer: fix crash when updating the current mat-index: use correct
...
index.
2017-02-01 20:11:12 +01:00
Kim Kulling
bfb6eb317c
Merge pull request #1160 from NolaDonato/materialindex
...
OBJParser: set material index when changing current material
2017-02-01 18:42:16 +01:00
nola.donato@samsung.com
e28b5422e0
OBJ: check for null mesh before updating material index
...
Sometimes the current mesh is null, should check before updating the material index
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-31 16:40:04 -08:00
nola.donato@samsung.com
fc4243a08f
OBJParser: set material index when changing current material
...
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.
submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:32:37 -08:00
nola.donato@samsung.com
df5fc5f68d
OBJParser: Support spaces in texture file names
...
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.
Submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:27:35 -08:00
Alexander Gessler
28a78ca460
Merge pull request #1156 from elect86/patch-7
...
Update ColladaParser.cpp
2017-01-28 13:28:47 +01:00
Alexander Gessler
16c50df071
Merge pull request #1154 from Kvalme/master
...
Fix for COLLADA export texture mapping #1084
2017-01-28 13:28:31 +01:00
Giuseppe Barbieri
ca47232101
Update ColladaParser.cpp
...
Fixed indent
2017-01-28 11:54:11 +01:00
Giuseppe Barbieri
c3c637be37
Update ColladaParser.cpp
2017-01-28 08:02:02 +01:00
Denis Biryukov
36e53b75fa
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:29:18 +03:00
Giuseppe Barbieri
0434f5a5ff
Update ColladaParser.cpp
2017-01-26 17:29:31 +01:00
Giuseppe Barbieri
85e2788e50
Update ColladaParser.cpp
2017-01-26 17:28:39 +01:00
Giuseppe Barbieri
3323d42ad6
Update PlyLoader.cpp
2017-01-20 19:30:36 +01:00
Giuseppe Barbieri
821e9fb0b8
Update PlyLoader.cpp
2017-01-19 22:43:38 +01:00
Kim Kulling
57975cb007
Merge pull request #1145 from elect86/patch-3
...
typo
2017-01-19 18:54:06 +01:00
Kim Kulling
82b1769759
Fix new call.
2017-01-19 13:38:06 +01:00
Kim Kulling
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
Kim Kulling
ebd04041ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-19 11:19:02 +01:00
Kim Kulling
f121e2eb66
Fixes https://github.com/assimp/assimp/issues/1143 : fix build.
2017-01-19 11:18:33 +01:00
Giuseppe Barbieri
11e1901922
typo
2017-01-18 21:56:33 +01:00
Kim Kulling
45eb13719e
fixes https://github.com/assimp/assimp/issues/1141 : fix typo.
2017-01-17 22:05:45 +01:00
Giuseppe Barbieri
54757a47a8
Update PlyLoader.cpp
...
Sorry, I was wrong
2017-01-16 21:09:38 +01:00
Giuseppe Barbieri
f14e433dd9
Update PlyLoader.cpp
...
Typo
2017-01-16 21:06:05 +01:00
Giuseppe Barbieri
f438652df8
Update PlyLoader.cpp
2017-01-16 21:04:24 +01:00
Giuseppe Barbieri
342824303c
Update PlyLoader.cpp
2017-01-16 21:01:49 +01:00
Kim Kulling
f16387e5a7
Merge pull request #1135 from hblasins/objExtension
...
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-16 20:22:41 +01:00
Henryk Blasinski
17cae8ac5a
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-12 17:11:17 -08:00
Antti Määttä
9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
Kim Kulling
a97a4fb03b
Merge pull request #1131 from Sibras/master
...
FBX: Fix light and camera transformations and add some missing properties.
2017-01-10 17:48:35 +01:00
Andy Maloney
6483b10997
{D3MF} Move #ifndefs before #includes
2017-01-10 09:53:11 -05:00
Matt Oliver
2f2fe92b62
FBX: Add additional material properties.
...
Currently there isnt a AI_MATKEY_DISPLACEMENTSCALING define but fbx supports the value so for the moment it is just manually specified.
2017-01-09 17:03:38 +11:00
Matt Oliver
5be2351dc6
FBX: Correct camera position and clip planes.
...
Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.
Fixes : #807 #643
2017-01-09 17:03:32 +11:00
Matt Oliver
b34a552fb7
FBX: Add correct light locations and falloff values.
...
Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.
The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.
Fixes #851
2017-01-09 17:03:25 +11:00
Tan Li Boon
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
Kim Kulling
dfa3409de9
Blender: add missing constructors.
2017-01-05 20:23:02 +01:00
Kim Kulling
58af9efdc9
FBX: fix compiler warning: remove unused local function.
2016-12-31 16:09:17 +01:00
Kim Kulling
6dfff37d8f
SubDivision: fix compiler warning: unused variable.
2016-12-31 16:07:11 +01:00
Kim Kulling
b934331985
closes https://github.com/assimp/assimp/issues/1111 : add warning when
...
detecting invalid mat definition.
2016-12-19 20:44:00 +01:00
Kim Kulling
bd0449ea79
closes assimp/assimp/issues/1101: copy aiTexture type declaration instead
...
of using decltype for declaration to fix iOS build.
2016-12-14 21:42:01 +01:00
Kim Kulling
5caa232b15
Merge pull request #1109 from assimp/issue_899
...
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 23:42:24 +01:00
Kim Kulling
df03c657bf
Merge pull request #1106 from elect86/master
...
OBJ, added the index to handle clamp option for each cubemap texture
2016-12-12 21:22:56 +01:00
Kim Kulling
859d15d3a0
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 21:22:03 +01:00
Giuseppe Barbieri
5127e18da6
Update PlyParser.h
...
Typo
2016-12-11 13:01:26 +01:00
Giuseppe Barbieri
b1d5390413
Update ObjFileImporter.cpp
2016-12-09 19:31:07 +01:00
Giuseppe Barbieri
83896f18b3
Update ObjFileImporter.h
2016-12-09 19:27:01 +01:00
Kim Kulling
b1e89e3636
closes https://github.com/assimp/assimp/issues/1098 : add license info.
2016-12-08 20:07:56 +01:00
Kim Kulling
d24ba9a4bb
Merge pull request #1099 from asmaloney/warning_fixes
...
Fixes two type warnings and a missing case option
2016-12-08 17:49:36 +01:00
Andy Maloney
0c7aac02eb
Fixes spelling in comments
2016-12-07 21:31:51 -05:00
Andy Maloney
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
Kim Kulling
a3a1c82380
Merge pull request #1087 from elect86/patch-4
...
Update ObjFileMtlImporter.cpp
2016-12-07 20:16:57 +01:00
Giuseppe Barbieri
ff73821cea
Update ObjFileMtlImporter.cpp
2016-12-07 19:52:03 +01:00
Mika Rautio
8929760b3e
Add better MinGW support for IFCReaderGen big objects
2016-12-05 12:57:05 +02:00
Mika Rautio
f9cce7f59c
MinGW __stat64 support depends on MSVCRT version
2016-12-05 12:33:48 +02:00
Mika Rautio
17fc3eea8f
Do not build exporter if its importer is not built
2016-12-05 11:12:46 +02:00
Kim Kulling
769805efd0
Merge branch 'master' into issue_1089
2016-12-02 14:31:18 +01:00
Kim Kulling
dcfc696e86
FBX: woraround for issue 1089.
2016-12-02 11:32:34 +01:00
Kim Kulling
c46ac37c9b
Merge pull request #1085 from elect86/patch-3
...
Update ObjFileParser.cpp
2016-12-01 17:56:20 +01:00
Kim Kulling
c80777f13f
Enable SIBImport test.
2016-11-30 17:49:22 +01:00
Kim Kulling
12ea506504
Enable unittest for apacity bug for dae files.
2016-11-30 15:05:06 +01:00
Kim Kulling
c2deb3e15f
BaseIMporter: fix review findings.
2016-11-30 15:03:32 +01:00
Kim Kulling
a80d7346d8
AMFImporter: fix some review findings.
2016-11-30 15:03:02 +01:00
Kim Kulling
f2817587ab
AMFImporter: use correct unique token to identify schema for AMF-assets.
2016-11-29 19:50:40 +01:00
Kim Kulling
43e1cae2ea
Fix appveyor build: disable bugger mingw config.
2016-11-28 10:40:10 +01:00
Giuseppe Barbieri
a2c82051d4
Update ObjFileMtlImporter.cpp
...
Fixed grammar
2016-11-27 22:44:03 +01:00
Giuseppe Barbieri
fe7863d22f
Update ObjFileParser.cpp
...
Fixed error message
2016-11-27 20:32:59 +01:00
Kim Kulling
181f78687f
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-27 16:44:03 +01:00
Kim Kulling
8272514b83
ObjImporter: use pre increment as a micro optimization.
2016-11-27 16:43:25 +01:00
Kim Kulling
8bfe465d03
Merge pull request #1083 from jaredmulconry/implementation_warning_fix
...
Fixed warnings on MSVC14 x64 (Issue #1065 )
2016-11-27 16:40:45 +01:00
Kim Kulling
1d9f91946f
Merge pull request #1080 from johnmaf/bugfix/collada-transparency
...
Properly export COLLADA <transparency> value
2016-11-27 16:30:59 +01:00
Jared Mulconry
cf151b77d8
Fixed build warnings on MSVC14 x64 in the XGL loader.
2016-11-27 16:03:25 +11:00
Jared Mulconry
7415289649
Fixed build warnings on MSVC14 x64 in X file importer.
2016-11-27 16:02:21 +11:00
Jared Mulconry
cbfbf2a256
Fixed build warnings on MSVC14 x64 in the X3D format sources.
2016-11-27 15:54:22 +11:00
Jared Mulconry
f22d78a3d3
Fixed build warnings on MSVC14 x64 in Unreal importer.
2016-11-27 14:36:45 +11:00
Jared Mulconry
39f54bf183
Fixed build warnings on MSVC14 x64 in Target Animation source.
2016-11-27 14:35:49 +11:00
Jared Mulconry
387afcf74f
Fixed build warnings on MSVC14 x64 in subdivision routine.
2016-11-27 13:37:32 +11:00
Jared Mulconry
58e0d8c261
Fixed build warnings on MSVC14 x64 in the STL format sources.
2016-11-27 13:32:44 +11:00
Jared Mulconry
f2e2aad647
Fixed build warnings on MSVC14 x64 in spacial sort.
2016-11-27 13:28:40 +11:00
Jared Mulconry
20318811ff
Fixed build warnings on MSVC14 x64 in the skeleton mesh builder.
2016-11-27 13:17:02 +11:00
Jared Mulconry
98e7eb476d
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/ObjFileImporter.cpp
2016-11-27 13:00:33 +11:00
John Senneker
578ed3f5d0
Properly export COLLADA <transparency> value
2016-11-25 12:09:49 -05:00
John Senneker
1541db01cc
Remove scaling of specular exponent in OBJFileImporter.cpp
2016-11-25 10:56:11 -05:00
Kim Kulling
f1254639d0
Merge pull request #1075 from Chainsawkitten/MinGW
...
Fix some MinGW warnings
2016-11-24 21:34:56 +01:00
Kim Kulling
d82fd0d750
closes https://github.com/assimp/assimp/issues/1076 : use ai_assert instead
...
of assert.
2016-11-24 21:15:07 +01:00
Albin Bernhardsson
347c09c539
Put back unused line (in comments)
2016-11-24 15:15:17 +01:00
Albin Bernhardsson
bde2b466be
Remove unnecessary semicolon
2016-11-24 14:53:33 +01:00
Albin Bernhardsson
bd6f94b926
Remove unused variable
2016-11-24 14:15:13 +01:00
Albin Bernhardsson
3b49dfe93e
Comment out unused variables
2016-11-24 14:10:24 +01:00
Albin Bernhardsson
30cd60ff82
Remove unnecessary semicolons
2016-11-24 13:26:18 +01:00
Kim Kulling
83e472cef3
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-23 20:20:45 +01:00
Kim Kulling
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +01:00
Jared Mulconry
f206249fbf
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
Kim Kulling
ba2f377b52
Fix coverity findings.
2016-11-22 22:03:31 +01:00
Kim Kulling
61e974f767
Merge pull request #1074 from assimp/testsuite_aiMetadata
...
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:20:02 +01:00
Kim Kulling
f45aeca3f6
Fix build: use ai_assert instead of assert.
2016-11-22 21:17:47 +01:00
Kim Kulling
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
Kim Kulling
c5e3058ab3
Fix coverity findings.
2016-11-22 10:22:15 +01:00
Kim Kulling
566aa1ae00
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-21 23:55:14 +01:00
Kim Kulling
c61146f52e
Add unittest fixure for aiMetadata.
2016-11-21 23:54:39 +01:00
Kim Kulling
9e07701f3e
Merge branch 'master' into coverity_scan
2016-11-21 10:18:17 +01:00
Kim Kulling
eb6390a639
Merge pull request #1071 from jaredmulconry/master
...
AMF Postprocessed Metadata given type bool regardless of original type
2016-11-20 17:52:47 +01:00
Giuseppe Barbieri
b6fb1f3c05
Update STLLoader.cpp
...
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
2016-11-20 15:14:33 +01:00
Jared Mulconry
ff31abf57c
Fixed build warnings on MSVC14 x64 in the scene combiner.
2016-11-20 14:07:24 +11:00
Jared Mulconry
439b4861c8
Fixed build warnings on MSVC14 x64 in the SIB format sources.
2016-11-20 14:06:56 +11:00
Jared Mulconry
655a470fc9
Fixed build warnings on MSVC14 x64 in the Quake 3 format sources.
2016-11-20 13:30:20 +11:00
Jared Mulconry
98aea657ff
Fixed build warnings on MSVC14 x64 in some helpers.
2016-11-20 13:18:11 +11:00
Jared Mulconry
f81e28f320
Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process.
2016-11-20 13:06:50 +11:00
Jared Mulconry
3e08a47d4f
Fixed build warnings on MSVC14 x64 in some scene optimisations.
2016-11-20 13:04:56 +11:00
Jared Mulconry
48e542d8d4
Fixed build warnings on MSVC14 x64 in the OpenGEX format sources.
2016-11-20 13:02:26 +11:00
Jared Mulconry
4a63f1759c
Fixed build warnings on MSVC14 x64 in the Ogre format sources.
2016-11-20 12:49:33 +11:00
Jared Mulconry
0c13322089
Fixed build warnings on MSVC14 x64 in the Obj format sources.
2016-11-20 12:29:26 +11:00
Jared Mulconry
8478b03f22
Fixed build warnings on MSVC14 x64 in the NDO format sources.
2016-11-20 12:27:04 +11:00
Jared Mulconry
2946a7349b
Fixed build warnings on MSVC14 x64 in the MS3D format sources.
2016-11-20 02:40:36 +11:00
Jared Mulconry
923b014472
Fixed build warnings on MSVC14 x64 in the MD3 and MD5 format sources.
2016-11-20 02:40:18 +11:00
Jared Mulconry
60cd4605eb
Fixed build warnings on MSVC14 x64 in the Material System source.
2016-11-20 02:11:01 +11:00
Jared Mulconry
335003a5a3
Fixed build warnings on MSVC14 x64 in the LWS format sources.
2016-11-20 02:03:53 +11:00
Jared Mulconry
2c93e29dcc
Fixed build warnings on MSVC14 x64 in the LWO format sources.
2016-11-20 02:01:57 +11:00
Jared Mulconry
4df18f93ea
Fixed build warnings on MSVC14 x64 in the limit bone weights post-process.
2016-11-20 01:53:47 +11:00
Jared Mulconry
1e2c0279b0
Fixed build warnings on MSVC14 x64 in the IRR format sources.
2016-11-20 01:52:04 +11:00
Jared Mulconry
c7efb50ad1
Fixed build warnings on MSVC14 x64 in the core Importer.
2016-11-20 01:36:33 +11:00
Jared Mulconry
5f098b2f94
Fixed build warnings on MSVC14 x64 in the IFC format sources.
2016-11-20 01:13:55 +11:00
Jared Mulconry
d9b0449e83
Fixed build warnings on MSVC14 x64 in the glTF format sources. One warning
...
yet to be resolved.
2016-11-20 00:18:29 +11:00
Jared Mulconry
2ac9b0ce45
Fixed build warnings on MSVC14 x64 in the FBX format sources.
2016-11-19 23:50:03 +11:00
Jared Mulconry
acad22cc1e
Fixed build warnings on MSVC14 x64 in the DXF format sources.
2016-11-19 03:53:28 +11:00
Jared Mulconry
0469a5c2e4
Fixed build warnings on MSVC14 x64 in the debone process.
2016-11-19 03:45:25 +11:00
Jared Mulconry
43ef4ec715
Fixed build warnings on MSVC14 x64 in the D3MF format sources.
2016-11-19 03:34:39 +11:00
Jared Mulconry
9a323d6de3
Fixed build warnings on MSVC14 x64 in the CSM loader.
2016-11-19 03:29:47 +11:00
Jared Mulconry
d16b8953b5
Fixed build warnings on MSVC14 x64 in the Collada exporter.
2016-11-19 03:24:55 +11:00
Jared Mulconry
4b6c69c4f8
Fixed an incorrect cast introduced in an earlier commit.
2016-11-19 03:17:39 +11:00
Jared Mulconry
128c27e89c
Fixed build warnings on MSVC14 x64 in the Collada loader.
2016-11-19 03:16:06 +11:00
Jared Mulconry
3b63e4af54
Fixed build warnings on MSVC14 x64 in the Collada parser.
2016-11-19 02:42:51 +11:00
Jared Mulconry
2866da1262
Fixed build warnings on MSVC14 x64 in the COB format sources.
2016-11-19 02:35:30 +11:00
Jared Mulconry
df6707a262
Fixed build warnings on MSVC14 x64 in the BVH format sources.
2016-11-19 02:33:58 +11:00
Jared Mulconry
e4d43aa51a
Fixed a bug in the AMF Importer Postprocessing where metadata would be
...
incorrectly recorded as having type bool for all entries.
2016-11-19 02:07:32 +11:00
Jared Mulconry
06beb50391
Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
...
build warnings in tests.
2016-11-19 01:54:27 +11:00
Jared Mulconry
bf5fc593eb
Fixed build warnings on MSVC14 x64 in the B3D format sources.
2016-11-19 01:21:59 +11:00
Jared Mulconry
a2dadbbe52
Fixed build warnings on MSVC14 x64 in the AssBin sources.
2016-11-19 00:39:11 +11:00
Jared Mulconry
6ba2dc4db3
Fixed build warnings on MSVC14 x64 in the postprocessing of AMF format.
2016-11-19 00:31:32 +11:00
Jared Mulconry
505928cc02
Fixed build warnings on MSVC14 x64 in the 3DS format sources.
2016-11-19 00:20:53 +11:00
Kim Kulling
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
Kim Kulling
a9c5b6f1be
Ensure that filelist for assimp lib is not empty for coveralls.
2016-11-17 19:57:24 +01:00
Kim Kulling
302b8044c6
Merge pull request #1064 from snowzurfer/master
...
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
Jared Mulconry
eceb61b854
Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
...
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8
.
2016-11-14 22:52:29 +11:00
Alberto Taiuti
ce4f696312
Revert "Make assimp build cherry-picked importers in CMake"
...
This reverts commit 70d5bb8c7b
.
2016-11-12 02:10:51 +00:00
Alberto Taiuti
70d5bb8c7b
Make assimp build cherry-picked importers in CMake
...
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.
From the explanation as written in the CMakeLists itself:
---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.
To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)
To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)
NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---
As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00
Kim Kulling
fdd01bda83
BatchImporter: make validation configurable and add unittest for class.
2016-11-12 02:04:05 +00:00
Kim Kulling
631eef49c3
BatchImporter: make validation configurable and add unittest for class.
2016-11-11 12:49:05 +01:00
Alberto Taiuti
cf7059f074
Fix obj .mtl file loading
...
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.
Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
2016-11-10 23:12:36 +00:00
Kim Kulling
c5d6ac2c30
ObjParser: remove deprecated code.
2016-11-10 21:39:32 +01:00
Kim Kulling
888ea72f20
Merge pull request #1061 from assimp/optimized_faces_in_obj
...
ObjImporter: remove unnecessary allocations of std::vector
2016-11-09 20:52:22 +01:00
Kim Kulling
c07aee21b7
Fix build
2016-11-09 20:18:26 +01:00
Kim Kulling
568b459e24
Fix review findings.
2016-11-09 20:16:45 +01:00
Kim Kulling
ae956044aa
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
...
face.
2016-11-09 20:09:45 +01:00
Kim Kulling
1d08c9e2e2
Merge pull request #1060 from assimp/issue_1059
...
Issue 1059
2016-11-08 21:31:47 +01:00
Kim Kulling
9f96126362
ObjParser: remove dead code.
2016-11-08 20:35:21 +01:00
Kim Kulling
5ff1c39e02
Obj-Parser: Fix performance issue.
2016-11-08 20:34:55 +01:00
Kim Kulling
1aafe6287c
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-07 17:20:27 +01:00
Kim Kulling
8ffd94937e
Fix BlenderDNA for clang cross compiler.
2016-11-07 17:19:49 +01:00
Kim Kulling
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
Kim Kulling
cc7b7723c1
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-05 18:41:52 +01:00
Kim Kulling
499886f89e
ScenePreprocessor: fix invalid index counter.
2016-11-05 18:41:19 +01:00
AndrzejKozik
dcb7478785
Update FBXConverter.cpp
2016-11-04 09:20:04 +01:00
AndrzejKozik
a074ca58b3
Keys interpolation fix
...
In line 3073 there was an unproper scope of cast to double.
2016-11-04 08:48:14 +01:00
Kim Kulling
dfaea27dfc
MaterialSystem: fix some findings.
2016-11-03 23:29:03 +01:00
Kim Kulling
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
Kim Kulling
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
Martin Gerhardy
b30dc8ffc9
Fixes compile issue for 3ds exporter
...
... when you have disabled the 3ds importer
2016-11-02 19:54:53 +01:00
Kim Kulling
3e05d13827
Merge pull request #1048 from tomacd/keep_materials_names
...
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
2016-10-31 09:42:45 +01:00
Kim Kulling
fcac614ad0
Blender: fix compiler warning: FAIL already defined.
2016-10-30 19:21:38 +01:00
Kim Kulling
810fc405a8
Fix build.
2016-10-30 09:06:45 +01:00
Kim Kulling
293654fe7c
Fix unittest.
2016-10-30 08:55:11 +01:00
Kim Kulling
b9261f01a3
Obj-Stream-Handling: fix compiler-errors and warnings.
2016-10-29 21:41:24 +02:00
Kim Kulling
186f3f091f
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling
2016-10-29 20:07:53 +02:00
Kim Kulling
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
tomacd
8e8757f800
Keep original materials names after RemoveRedundant materials process and export to collada
2016-10-27 19:23:43 +02:00
Kim Kulling
949a27a743
New streaming interface: fix build.
2016-10-22 23:34:56 +02:00
Kim Kulling
cbe2e9af49
Merge branch 'master' into new_obj_stream_handling
2016-10-22 21:04:02 +02:00
Kim Kulling
d3a3bd9c12
BUgfixes regarding filepos setupBUgfixes regarding filepos setup.
2016-10-22 21:03:11 +02:00
Kim Kulling
33e370a8b7
Obj-Stream-Handling: fix readin of linewise import.
2016-10-21 21:14:35 +02:00
Kim Kulling
1724cc9e66
Remove redundant file.
2016-10-21 19:44:31 +02:00
Kim Kulling
50803b897c
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-21 19:43:56 +02:00
Kim Kulling
fe0cfc52bc
Q3BSP-Loader: reformat include.
2016-10-20 22:25:39 +02:00
Kim Kulling
af54cb8a29
Q3BSP: fix license dates.
2016-10-20 17:04:37 +02:00
Kim Kulling
6a31e3528e
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-20 16:43:38 +02:00
Kim Kulling
91e833056e
Q3BSP-Importer: remove commented code.
2016-10-20 16:42:00 +02:00
Kim Kulling
b0f09ee6e2
Merge pull request #903 from dontbmh/upstream
...
fix strncpy not null terminated string
2016-10-20 16:18:30 +02:00
Kim Kulling
74ab4afd01
Merge pull request #1042 from VeganPower/Fix_988
...
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-19 16:03:53 +02:00
Kim Kulling
bac28061ea
3MF: fix nullptr access.
2016-10-18 21:16:44 +02:00
John Senneker
acd2802f22
Check for std::string::npos before applying std::string::substr
2016-10-18 10:48:47 -04:00
Kim Kulling
a54e42cb5a
Some more fixes.
2016-10-18 14:02:58 +02:00
John Senneker
4b15dfd9af
Fix OBJ parser mtllib statement parsing bug.
...
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
2016-10-17 18:48:04 -04:00
Kim Kulling
5cd16a0aa6
Merge pull request #1034 from ascandal/feature/gltf-compact-skins
...
glTF compact skins
2016-10-17 21:45:50 +02:00
Kim Kulling
ea0424de18
Merge pull request #1037 from ystreet/cfileio-leaks
...
cfileio: fix leaks by not closing files in the destructor
2016-10-17 17:29:38 +02:00
Kim Kulling
862dfd5a05
Merge pull request #1032 from ashdnazg/master
...
use cmath and C++ (std::) versions of math functions
2016-10-17 17:26:32 +02:00
Matthew Waters
cbcaa107eb
cfileio: fix leaks by not closing files in the destructor
...
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them. The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.
This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
2016-10-18 00:35:56 +11:00
Kim Kulling
09ad67f469
3MF-Importer: remove unused variable.
2016-10-16 17:14:22 +02:00
Angelo Scandaliato
6ce2a37b82
merge upstream/master and fix conflicts
2016-10-15 18:12:02 -07:00
Angelo Scandaliato
fcf2d6357e
check if bones exist before creating skin
2016-10-15 17:21:55 -07:00
Kim Kulling
5cb4df80ad
C++11-combat: hopefully the last std::to_string to replace.
2016-10-15 21:45:58 +02:00
Kim Kulling
46d78f57d5
OpenGEXImporter: fix compiler warning.
2016-10-15 21:45:09 +02:00
Kim Kulling
7681089abc
C++11-Combat: last replacements of std::to_string.
2016-10-15 21:30:02 +02:00
Kim Kulling
e0dde73018
C++11-combat: replace more std::to_string by assimp-specific to_string
2016-10-15 21:25:16 +02:00
Kim Kulling
b90669c45e
C++11: Replace std::to_string by assimp-specific implementation.
2016-10-15 20:36:51 +02:00
Eshed
a84bf869c2
replace more math.h functions occurences with std::
2016-10-15 12:05:57 +03:00
Eshed
3b6ffc3ef5
fix mingw build (mingw supports stat64 nowadays)
2016-10-15 03:52:50 +03:00
Eshed
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
Angelo Scandaliato
9c4bb1c9bc
find the correct index in jointNames
2016-10-14 15:47:21 -07:00
Rosario Leonardi
2505f02263
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-14 17:47:10 +01:00
Angelo Scandaliato
1c03aebfb8
test combining skins
2016-10-13 19:49:59 -07:00
Kim Kulling
084a6f6415
Obj-Streaming: add new io-stream for line-wise cached reading + first
...
bugfixes.
2016-10-12 15:30:04 +02:00
Angelo Scandaliato
dc1e11c8be
added some comments
2016-10-11 15:33:52 -07:00
Angelo Scandaliato
57a00d5faa
find skeleton root joint and only allow four joint weights per vertex
2016-10-11 15:28:04 -07:00
Kim Kulling
ccf32aaf57
Merge pull request #1029 from samitc/master
...
fix bug when reading strings in quote in MD5 models
2016-10-11 13:48:24 +02:00
Kim Kulling
905e48a35c
Buffered stream API for big files: add next try of a prototype.^
2016-10-11 12:29:40 +02:00
amit512
96a64a353a
fix bug when reading strings in quote in MD5 models
2016-10-11 13:04:41 +03:00
Kim Kulling
6a0d4bac35
Merge pull request #1026 from ascandal/feature/gltf-skins-animation
...
glTF skinning animation
2016-10-10 22:20:10 +02:00
Sergey Kosarevsky
1c78f1be03
Fixed: unzip.h was still included even if the D3MF importer is disabled
2016-10-10 17:58:06 +02:00
Kim Kulling
bf06ee3ed4
Merge branch 'master' into new_obj_stream_handling
2016-10-10 10:19:45 +02:00
Kim Kulling
ad4d1f717f
Obj-Import: finish first prototype of IOStreamBuffer.
2016-10-10 10:18:14 +02:00
Kim Kulling
47dd1eb227
Merge pull request #1025 from smalcom/issue_768
...
Issue 768
2016-10-09 18:09:19 +02:00
Angelo Scandaliato
1f377bc99d
try to find root joint node for skeleton
2016-10-08 19:18:13 -07:00
Angelo Scandaliato
c49971e120
fix bug when exporting mRotationKeys data
2016-10-08 15:36:01 -07:00
Angelo Scandaliato
71de606770
add skeleton and mesh to node containing the mesh
2016-10-08 15:34:00 -07:00
Angelo Scandaliato
57b9232075
deleted code/MakeFile and added to .gitignore
2016-10-08 15:23:59 -07:00
Alexandr Arutjunov
0359ded946
[F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'.
2016-10-07 16:40:51 +03:00
Kim Kulling
6f6dd69270
Merge pull request #1021 from smalcom/export_x3d
...
Export x3d
2016-10-07 13:05:02 +02:00
Kim Kulling
d474c24753
Merge pull request #1024 from ascandal/feature/glTF-animations
...
Export glTF node animations
2016-10-07 10:30:42 +02:00
Angelo Scandaliato
574abd3c01
removed obsolete commented out code
2016-10-07 00:26:08 -07:00
Kim Kulling
0bae2bbfa7
Obj-Importer: start new streaming handling.
2016-10-07 09:19:10 +02:00
Angelo Scandaliato
84803bd51a
removed cout debugging statements and older ExportSkins function
2016-10-06 23:57:16 -07:00
Angelo Scandaliato
d128837a3a
export vertex joint and weight information
2016-10-06 18:59:53 -07:00
Angelo Scandaliato
ae36ca0e44
moved ExportSkins function into ExportMeshes function
2016-10-06 15:18:33 -07:00
Angelo Scandaliato
83c9addbc9
removed duplicate function for ExportData
2016-10-06 13:01:03 -07:00
Angelo Scandaliato
f59b8b3a59
export inverseBindMatrix Data for skins
2016-10-06 12:56:34 -07:00
Angelo Scandaliato
42a8d58f45
Export Nodes before meshes to avoid issue if node id's are changed
2016-10-06 11:29:09 -07:00
Alexandr Arutjunov
c6d233768f
[F] Small doc changes.
2016-10-06 19:02:37 +03:00
Alexandr Arutjunov
8c6ee48af5
[*] Merged fresh master and resolved conflicts.
2016-10-06 17:12:56 +03:00
Alexandr Arutjunov
9a4d693773
[+] Export to X3D format.
2016-10-06 17:04:37 +03:00
Alexandr Arutjunov
85d5fc2169
[-] Removed unneeded logging.
...
[F] Invalid metadata type used in postprocessing.
2016-10-06 17:04:08 +03:00
Angelo Scandaliato
4ac57f1fab
fixed issues to get node animations working
2016-10-06 02:34:11 -07:00
Angelo Scandaliato
0313328a92
set bindShapeMatrix to identity
2016-10-05 18:16:32 -07:00
Angelo Scandaliato
79852de5ae
added skins and jointNames
2016-10-05 17:30:02 -07:00
Angelo Scandaliato
cfa0ea3189
finished first version of extport animation data
2016-10-05 13:32:06 -07:00
Kim Kulling
b61aaf7ec4
New animation file for OpenGEX.
2016-10-05 20:14:42 +02:00
abma
a3295c6640
fix compile warning
2016-10-05 02:07:42 +02:00
Kim Kulling
0aab2aa96a
Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
...
Parse homogeneous vertex coordinates in OBJs
2016-10-04 23:12:05 +02:00
Kim Kulling
f94b7287fc
Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
...
Fix glTF validator errors
2016-10-04 23:10:30 +02:00
Kim Kulling
7a721b3014
Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
...
Sort by primitive type before exporting as glTF
2016-10-04 23:09:16 +02:00
John Senneker
c3ebdc56de
Parse homogeneous vertex coordinates in OBJs
2016-10-04 17:06:31 -04:00
Alexandr Arutjunov
9d40f36f87
[F] Fixed type in list.
...
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
2016-10-04 23:58:51 +03:00
Alexandr Arutjunov
0ba0eca48e
[+] Call for X3D exporter.
2016-10-04 23:55:08 +03:00
Kim Kulling
8d3184f6fb
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-04 18:41:25 +02:00
Kim Kulling
86dc3f7a79
X3D: Some more reformattings and missing initializations.
2016-10-04 18:40:58 +02:00
Angelo Scandaliato
d249cca011
created the asset writer function for animations export gltf
2016-10-04 07:09:01 -07:00
Martin Gerhardy
7bf6cfc9f6
removed BOM
2016-10-04 12:45:28 +02:00
Kim Kulling
7b9162136f
Some small format changes for assimp-style :-).
2016-10-04 11:45:08 +02:00
Angelo Scandaliato
37d32e79c9
created exportAnimation function
2016-10-03 19:29:37 -07:00
John Senneker
f378230a13
Sort by primitive type before exporting as glTF
2016-10-03 17:19:44 -04:00
Kim Kulling
9dc4fb2aa3
AMF: add missing license info.
2016-10-03 19:24:14 +02:00
Angelo Scandaliato
99c93e861c
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
2016-10-03 09:34:16 -07:00
Alexandr Arutjunov
aeb99898d3
[*] Set float type for constants: less warnings, less type truncations.
2016-10-02 20:00:57 +03:00
Alexandr Arutjunov
897370b6ff
[*] Pull fresh data.
...
[F] Using ssize_t is bad idea.
2016-10-02 19:52:24 +03:00
Alexandr Arutjunov
268b18dabf
Merge branch 'master' into import_x3d
2016-10-02 17:31:44 +03:00
Alexandr Arutjunov
3086a07e86
[*] Docs and build-files fixes.
2016-10-02 17:27:13 +03:00
Kim Kulling
59212bf55a
Merge pull request #1011 from smalcom/import_amf
...
Import amf
2016-10-02 14:52:00 +02:00
Kim Kulling
6233f65b3a
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency
...
glTF: Read and write transparency values
2016-10-02 11:52:59 +02:00
Alexandr Arutjunov
9c0de90ede
[F] Fixed missed break.
...
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
2016-10-02 03:08:34 +03:00
Alexandr Arutjunov
823003ba9b
[F] Fixing checking rule
2016-10-02 02:28:06 +03:00
Angelo Scandaliato
0619232aef
included samplers dictionary for textures
2016-09-30 17:23:38 -07:00
Alexandr Arutjunov
8856f7f6ae
Merge branch 'import_amf' into import_x3d
2016-09-30 02:38:59 +03:00
Alexandr Arutjunov
9d4d0de607
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:24:24 +03:00
Alexandr Arutjunov
c1a3912b3f
[F] Erasing with constant iterator. Strange that new gcc is allow this.
...
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:12:46 +03:00
John Senneker
83c0163ec6
glTF: Read and write transparency values
2016-09-29 17:44:04 -04:00
Alexandr Arutjunov
db54eb98e3
Merge branch 'import_amf' into import_x3d
2016-09-30 00:30:26 +03:00
Alexandr Arutjunov
f497f739fa
[*] Not all modern compilers is support new C++ feature "using". What the sad?
2016-09-30 00:03:34 +03:00
Alexandr Arutjunov
8ad6c80dac
[*] Removed Boost dependency.
2016-09-29 23:48:41 +03:00
Alexandr Arutjunov
61bced27df
[*] Removed Boost dependency.
2016-09-29 23:38:24 +03:00
Alexandr Arutjunov
76c84aa24d
[F] Header missed.
2016-09-29 23:19:47 +03:00
Alexandr Arutjunov
ef9b6a7375
[F] Removed UTF-8 BOM
2016-09-29 23:16:59 +03:00
Alexandr Arutjunov
3274951f2a
[+] X3D importer.
2016-09-29 18:50:24 +03:00
Alexandr Arutjunov
e4cb388153
[*] Style and doc changes.
2016-09-29 18:04:31 +03:00
Alexandr Arutjunov
818fb2e901
[F] Typo: invalid format hint index.
2016-09-29 17:11:53 +03:00
Angelo Scandaliato
7dd2e7011d
fixed issue with texcoordinate bufferview target
2016-09-28 18:50:08 -07:00
Angelo Scandaliato
f2e6f2f67f
work around for indices array in ExportData
2016-09-28 15:56:06 -07:00
Angelo Scandaliato
e89e98291a
calculate and write min and max attributes for accessors
2016-09-28 14:47:15 -07:00
Alexandr Arutjunov
0a25b076b8
Merge branch 'master' into import_amf
2016-09-28 17:51:59 +03:00
Alexandr Arutjunov
cb38054247
[+] AMF-importer. Also some fixes for modern Assimp.
2016-09-28 17:49:15 +03:00
Kim Kulling
9f7e34663e
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
2016-09-28 16:16:06 +02:00
Kim Kulling
f383ec0797
Fix some review findings.
2016-09-28 00:06:23 +02:00
Kim Kulling
cd9cb50eaf
OpenGEX: fix some review findings.
2016-09-28 00:06:06 +02:00
Angelo Scandaliato
3e322495f2
asset.version from int to string
2016-09-27 11:38:17 -07:00
Kim Kulling
36d770d3db
OpenGEX: fix some review findings.
2016-09-27 19:47:27 +02:00
Kim Kulling
78dae87de2
closes https://github.com/assimp/assimp/issues/954 : add import of vertex
...
colors in
penGEX-importer.
2016-09-27 19:40:06 +02:00
Alexandr Arutjunov
6a9ccf2016
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.
2016-09-26 13:01:38 +03:00
Alexandr Arutjunov
386128febc
[+] Building AMF-importer.
2016-09-26 12:57:44 +03:00
wise86Android
8e9c0235d3
153083/2 Buffer not null terminated
2016-09-25 15:21:30 +02:00
wise86Android
07ec476b7d
122143,122139 Copy into fixed size buffer
2016-09-24 21:34:58 +02:00
wise86Android
08da6b278d
122180 Resource leak
2016-09-24 20:29:49 +02:00
wise86Android
33dcf4dbd3
122185 Pointer to local outside scope
2016-09-24 20:24:38 +02:00
wise86Android
94538e9d87
122193 Uninitialized scalar variable
2016-09-24 20:19:43 +02:00
wise86Android
5bec41ad16
122198 Resource leak
2016-09-24 20:11:07 +02:00
wise86Android
4872c4caf8
122238 Use after free
2016-09-24 19:19:48 +02:00
wise86Android
3f53ffa576
122243,122194 Resource leak
2016-09-24 16:27:40 +02:00
wise86Android
61097479c8
122243 Resource leak
2016-09-24 15:55:37 +02:00
wise86Android
04e0552f9e
134062 Use after free
2016-09-24 12:33:53 +02:00
Kim Kulling
38b9ae2c6c
closes https://github.com/assimp/assimp/issues/584 : export scene combiner.
2016-09-24 00:27:45 +02:00
Kim Kulling
b50d734d75
IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 (
...
Thanks Qt! )
2016-09-23 19:48:38 +02:00
Kim Kulling
38cbdcd885
Merge pull request #1001 from johnmaf/feature/glTF/separate-bin
...
Export glTF buffer data in a separate .bin file
2016-09-21 19:39:38 +02:00
johnmaf
0277a23521
Add Triangulate post-processing step to glTF exporters
2016-09-21 11:33:02 -04:00
johnmaf
3052f35824
glTF: move mesh splitting to constructor to cover GLB
2016-09-20 14:15:42 -04:00
johnmaf
c9f28192d9
Merge upstream master
2016-09-20 11:53:12 -04:00
Alexandr Arutjunov
f11545d2c0
[*] Merge with fresh master.
2016-09-20 16:02:41 +03:00
Kim Kulling
b8950f6d90
Merge pull request #998 from johnmaf/bugfix/gltfUVs
...
Flip UVs in glTFExporter
2016-09-20 09:53:57 +02:00
Kim Kulling
097743880c
Merge pull request #999 from johnmaf/feature/single-glTF-buffer
...
Add all glTF data to single buffer
2016-09-20 09:52:54 +02:00
johnmaf
3c827f29f6
Export glTF buffers as separate .bin files
2016-09-19 17:44:38 -04:00
wise86Android
96fab1cf55
122219-122218 Big parameter passed by value
2016-09-19 22:23:13 +02:00
Alexandr Arutjunov
a9284e5a95
[F] Removed unneeded definitions.
...
[F] Add library for linker.
2016-09-15 20:39:39 +03:00
johnmaf
cd038209dd
Add all glTF data to single buffer
2016-09-15 10:38:02 -04:00
Alexandr Arutjunov
65048d1ef7
[F] Removed Unicode BOM at file beginning.
2016-09-15 14:45:00 +03:00
johnmaf
8b3f348d63
Flip UVs in glTFExporter
2016-09-14 18:03:52 -04:00
Alexandr Arutjunov
40cfb45c74
[F] Not set option-variable (only define for compilation was set.
...
[F] For adding library can not be used TARGET_LINK_LIBRARIES
2016-09-13 13:29:12 +03:00
Alexandr Arutjunov
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
Kim Kulling
f51cd4c6d4
Merge branch 'master' into coverity_scan
2016-09-12 12:42:11 +02:00
Kim Kulling
0c00edb40e
Blender: fix some minor findings.
2016-09-12 12:41:49 +02:00
Kim Kulling
c98915e382
Merge pull request #949 from r-chris/fix-material-bugs
...
Fixing bugs related to 64-bit upgrade in materials
2016-09-12 09:41:58 +02:00
Alexandr Arutjunov
a375344052
Merge branch 'master' into gltf_o3dgc
2016-09-10 10:37:32 +03:00
Kim Kulling
22cfe84cba
3MF: add a simple box example from the 3MF-sample repo.
2016-09-10 09:27:29 +02:00
Kim Kulling
7cedd4ab89
CMake: fix buildCMake: fix build..
2016-09-10 08:48:01 +02:00
Alexandr Arutjunov
5fe32caa6d
Merge branch 'master' into gltf_o3dgc
2016-09-10 09:14:28 +03:00
Alexandr Arutjunov
d97f00571e
[*] Not needed namespace.
2016-09-10 09:07:50 +03:00
Alexandr Arutjunov
ac1bcaa4cc
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
2016-09-10 09:05:36 +03:00
Kim Kulling
95676b4db9
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-09 20:42:36 +02:00
Kim Kulling
05fce9a008
3MF: make xml tags static const.
2016-09-09 20:42:02 +02:00
Kim Kulling
b22f93eabf
3MFImporter: add source group for visual dtudio.
2016-09-09 20:41:04 +02:00
Alexandr Arutjunov
d49ad6c93e
[*] Stylistic changes.
...
[F] Added all files from Open3DGC codec to CMakeLists.txt
2016-09-09 16:38:43 +03:00
johnmaf
702d57fbae
Split mesh before exporting gltf. Fixes #995
2016-09-07 17:03:19 -04:00
Kim Kulling
ccf1b368c8
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-06 15:46:41 +02:00
Kim Kulling
ffdca3593b
ObjImporter: remove unused code.
2016-09-06 15:41:37 +02:00
Kim Kulling
0f2cea7ba6
Blender: revert fix for suspicious crash in blender on windows.
2016-09-06 10:42:02 +02:00
Kim Kulling
9e19b5103c
IrrImporter: Fix release functions.
2016-09-05 10:48:30 +02:00
Kim Kulling
a54835c91d
Merge master
2016-09-04 20:41:20 +02:00
Kim Kulling
cc860ede66
Fix coverity findings: fix usage after free.
2016-09-04 20:40:34 +02:00
Kim Kulling
9d4d2b2a1c
ComputeUVMappingprocess: add missing initialization for scalar value.
2016-09-04 20:35:07 +02:00
Kim Kulling
bcdc79ba73
Fix invalid release of mat + mesh.
2016-09-04 20:22:04 +02:00
Kim Kulling
e51b7d2a61
IFC: fix possible use after free access bug.
2016-09-02 20:06:56 +02:00
Kim Kulling
b240b9d30d
Blender: fix invalid OnjectCompare op.
2016-09-02 20:06:31 +02:00
Kim Kulling
2568797015
MDLMoader: fix resource leak.
2016-08-30 19:50:53 +02:00
Kim Kulling
659a55be4a
Fix coverity finding: use deep copy instead of reference showing to
...
mem-adress when reading and calling push_back in a std::vector.
2016-08-30 19:46:34 +02:00
Kim Kulling
c6f670ff50
glTFImporter: avoid out-of-bounds-access.
2016-08-29 20:05:29 +02:00
Kim Kulling
147921ac39
MakeVerboseFormat: fix invalid delete statement.
2016-08-29 19:56:38 +02:00
Kim Kulling
26aa18c75a
Fix findings from code review.
2016-08-29 18:23:41 +02:00
Kim Kulling
2545dee58d
Fix coverity findings: fix possible out-of-bound access.
2016-08-29 15:32:27 +02:00
Kim Kulling
238f14f30f
Fix coverity findings: fix possible usage after calling free.
2016-08-29 15:28:37 +02:00
Kim Kulling
a66e644bf3
Fix coverity finding: fix possible use after free..
2016-08-29 15:24:24 +02:00
Kim Kulling
243df452a4
GeometryBuilder: fix update of vertices.
2016-08-25 18:20:52 +02:00
Kim Kulling
85b3e45aa7
Merge pull request #984 from jwwalker/upstream
...
Add typecasts in glTFAssetWriter.inl to fix compile errors
2016-08-19 10:26:48 +02:00
James Walker
666d1ce164
Changed C-style casts to static_cast.
2016-08-18 10:55:24 -07:00
Daniel Knezevic
c2c12c1db5
Use Assimp namespace to fix build for big-endian architectures
2016-08-18 10:51:20 +02:00
James Walker
e9ecd6f8a7
Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: < https://github.com/assimp/assimp/issues/980 >
2016-08-17 17:48:29 -07:00
Chris Russ
3f08cebfab
include config.h to always have the correct types (float/double) exposed
2016-08-17 07:57:31 +10:00
Chris Russ
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
Chris Russ
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
roshan.c
27f81884f9
adding support to store all the layered textures
2016-08-15 09:58:53 -07:00
Alexandr Arutjunov
2732e5d9b6
[F] Removed Unicode BOM.
2016-08-14 19:49:05 +03:00
Alexandr Arutjunov
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
Alexandr Arutjunov
48f8c117e2
[F] Conditional compilation for Open3DGC-extension.
...
[F] Flag comp_allow did not reset when mesh can not be encoded.
2016-08-14 16:27:16 +03:00
Kim Kulling
b916857659
closes https://github.com/assimp/assimp/issues/967 : add unzip include path
...
when no other version was found.
2016-08-14 11:44:21 +02:00
Alexandr Arutjunov
de70f5c028
[+] Added link to RT library when using Open3DGC-compression.
2016-08-13 17:44:58 +03:00
Alexandr Arutjunov
3a10a3cf03
[-] Removed unneeded include.
2016-08-13 16:27:34 +03:00
Alexandr Arutjunov
8ab50aa9a0
[*] Few C++11 constructions are removed.
2016-08-13 16:27:07 +03:00
Alexandr Arutjunov
1844665693
[*] Few C++11 constructions are removed.
2016-08-13 16:09:21 +03:00
Kim Kulling
0379675fca
Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0
2016-08-12 18:47:37 +02:00
Kim Kulling
83b02ff41f
DefaultIOStream: add missing detection for apple-based OS.
2016-08-12 18:14:26 +02:00
Kim Kulling
bdcff35d5d
closes https://github.com/assimp/assimp/issues/901
2016-08-12 17:13:18 +02:00
Alexandr Arutjunov
0ad2f2247a
[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.
2016-08-11 01:04:30 +03:00
Alexandr Arutjunov
778ad7f06f
[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.
2016-08-09 13:37:32 +03:00
Alexandr Arutjunov
9a4fa1321b
[+] Save parameters of mesh extension: Open3DGC-compression.
2016-08-09 13:26:57 +03:00
Alexandr Arutjunov
507668229f
[+] Support Open3DGC for glTF import/export. Intermediate commit.
2016-08-08 19:24:50 +03:00
Alexandr Arutjunov
41ed74beb6
[*] Style. Intermediate commit.
2016-08-08 19:07:30 +03:00
Alexandr Arutjunov
a6ec0e4c7a
[*] Style. Intermediate commit.
2016-08-08 19:06:17 +03:00
Alexandr Arutjunov
29e982e185
[F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl.
2016-08-03 18:06:38 +03:00
Alexandr Arutjunov
c024beadba
[+] Put information to log about decompressing.
2016-08-03 11:16:30 +03:00
Alexandr Arutjunov
5e4fd5fa3c
[+] glTF. Support for import meshes with Open3DGC compression.
2016-08-03 03:46:04 +03:00
Alexandr Arutjunov
2e452205aa
[+] Building of Open3DGC codec.
2016-08-03 03:40:53 +03:00
Alexander Gessler
454320ad08
Merge pull request #953 from TrianglesPCT/master
...
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
2016-07-27 21:37:02 +02:00
TrianglesPCT
66c1a176de
Add files via upload
...
forcing a new build
2016-07-25 23:04:08 -06:00
Adi Shavit @ MacBookPro
f119447549
Fixes compilation on OSX with gcc.
...
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
2016-07-25 16:33:25 +03:00
TrianglesPCT
667aa37fdd
Add files via upload
...
used ai_real instead of float
2016-07-24 18:45:41 -06:00
TrianglesPCT
28c9f56c5e
Add files via upload
...
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
TrianglesPCT
bcb86bcc35
Add files via upload
...
fix blender vert colors being casted to signed char, which was causing negative values.
Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies
2016-07-24 02:23:59 -06:00
Volodymyr Boichentsov
5c5acae92e
Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
...
Fixed issue in case 'usemtl' goes straight after 'g'.
2016-07-22 14:10:06 +01:00
Kim Kulling
5fc3ee9a21
fix https://github.com/assimp/assimp/issues/946 : use correct test for objectcompare in blender.
2016-07-17 13:54:01 +02:00
Chris Russ
c57b524a59
moving cmake configure_file to appropriate location
2016-07-16 18:47:59 +10:00
Chris Russ
a7894b090d
Upgrading PLY exporter to allow element definition as double
2016-07-16 18:23:33 +10:00
Chris Russ
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
Chris Russ
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
Chris Russ
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
Chris Russ
5adb0e899c
CMake Option and moving more functions to optional double support
2016-07-16 18:23:33 +10:00
Chris Russ
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
Kim Kulling
45fae27aed
DefaultIOStream: export class for testing.
2016-07-16 09:13:59 +02:00
Kim Kulling
a15a77dff5
glTF: fix doxygen typo.
2016-07-15 10:35:44 +02:00
Kim Kulling
e1697b30bc
Blender: mark local function as static.
2016-07-15 10:33:48 +02:00
Kim Kulling
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
Kim Kulling
02602ce9af
Update license date.
2016-07-10 15:34:58 +02:00
Kim Kulling
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
Kim Kulling
4d012bc476
Update version.
2016-07-08 18:40:26 +02:00
Kim Kulling
599e846f57
Remove dead code.
2016-07-08 18:31:19 +02:00
Kim Kulling
070fb3363f
Closes https://github.com/assimp/assimp/issues/940 : use standard offsetof
...
instead of an own version.
2016-07-08 18:30:26 +02:00
Chris Russ
a5b3ce9a3c
reverting back to 16 digit precision export
...
having to import 17 digit floats likely leads to issues in many other apps
2016-07-06 15:33:51 +10:00
Chris Russ
10f22779f4
setting default export precision to 17 for all exporters
2016-07-06 14:49:14 +10:00
Kim Kulling
19769eef8b
Version: prepare 3.3 version.
2016-07-05 18:43:16 +02:00
Fabian Herb
7b08233ef2
Fix identation
2016-07-01 17:08:28 +02:00
Fabian Herb
3c7dd2b302
More whitespace consistency
2016-07-01 17:02:54 +02:00
Fabian Herb
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
cmdrf
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
Kim Kulling
886cea2933
Merge pull request #927 from royshil/obj_color_vertices_support
...
adding support for per-vertex colors in OBJ files.
2016-06-28 22:08:59 +02:00
Kim Kulling
5321072007
Static code analysis: fix minor finding.
2016-06-28 11:25:04 +02:00
Roy Shilkrot
7d98643bcf
adding support for per-vertex colors.
2016-06-27 20:08:22 -04:00
Kim Kulling
9b6de15b74
closes https://github.com/assimp/assimp/issues/904 : add ai_strtof for
...
VS2012.
2016-06-20 20:30:29 +02:00
Kim Kulling
447a9642c2
closes https://github.com/assimp/assimp/issues/918 : use correct lib
...
install name for macos.
2016-06-17 20:42:19 +02:00
Kim Kulling
b01e424476
Merge pull request #917 from assimp/feature/new_includes
...
Feature/new includes
2016-06-14 22:54:56 +02:00
Kim Kulling
62e07a8af0
closes https://github.com/assimp/assimp/issues/911 : use correct include
...
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
Kim Kulling
334ac9a7d0
Merge pull request #908 from Adjective-Object/master
...
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
Kangning Li
f15b6177f7
glTFExporter fixes: spaces to tabs
2016-06-10 13:41:59 -04:00
Kangning Li
32d9ef042a
Merge branch 'master' into gltfErrors
2016-06-10 09:51:35 -04:00
Kangning Li
c98e77907c
fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets
2016-06-10 09:49:04 -04:00
Kim Kulling
81773b4e4e
Update fast_atof.h
...
Fix include brackets.
2016-06-07 11:51:09 +02:00
Kim Kulling
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
Maxwell Huang-Hobbs
d23439451a
Added 'joint' node type to Collada export
2016-06-05 21:04:02 -04:00
Kim Kulling
814d2e7821
Merge branch 'master' of https://github.com/assimp/assimp
2016-06-04 19:04:06 +02:00
Kim Kulling
0a1dda22b2
ColladaParser: add warning when empty semantic will be parsed.
2016-06-04 17:53:51 +02:00
Kim Kulling
d67c8c29b6
Merge pull request #898 from turol/cxx11-refactor
...
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
Dirk
bb2b30e54a
fix strncpy not null terminated bug
2016-05-26 16:13:21 +08:00
Kim Kulling
8fa0071d16
closes https://github.com/assimp/assimp/issues/892 : add own to_string
...
implementation.
2016-05-26 00:44:29 +02:00
Kim Kulling
4e982c0538
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-26 00:41:48 +02:00
Kim Kulling
2cbbc3da09
OpenGEX-Importer: remove dead code.
2016-05-26 00:41:31 +02:00
Kim Kulling
abad093d09
Update OpenGEXImporter.cpp
...
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
Kim Kulling
5463146688
Add std::string header.
2016-05-25 00:58:05 +02:00
Kim Kulling
f9f493d017
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-25 00:27:16 +02:00
Kim Kulling
037fec275c
std::to_string: add replacement for android build chain.
2016-05-25 00:26:41 +02:00
Turo Lamminen
381f87507f
SplitLargeMeshes: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
896ab8eee2
Unreal: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
d238597459
Raw: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
6c9c040419
Q3BSP: Use C++11 range-based for loop
2016-05-23 17:33:51 +03:00
Turo Lamminen
a09a6a40c0
OpenGEX: Use C++11 range-based for loop
2016-05-23 17:33:49 +03:00
Turo Lamminen
32e4dd0bd1
Ogre: Use C++11 range-based for loop
2016-05-23 17:30:48 +03:00
Turo Lamminen
3eb9b8e91b
NFF: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
Turo Lamminen
ac676d4d3c
MD5: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
Turo Lamminen
b9fbfbc18a
LWO: Use C++11 range-based for loop
2016-05-23 17:30:42 +03:00
Alexander Gessler
cd4f212b5f
Merge pull request #891 from ciechowoj/blender_materials
...
Blender materials
2016-05-22 14:39:45 +02:00
Turo Lamminen
3031470ec1
IRR: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
c7c756d344
FBX: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
8566b9aa90
D3MF: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
52405bbe1b
Collada: Use C++11 range-based for loop
2016-05-22 13:57:11 +03:00
Turo Lamminen
f0ebb40f19
ASE: Use C++11 range-based for loop
2016-05-22 13:57:09 +03:00
Turo Lamminen
b345f79d45
3DS: Use C++11 range-based for loop
2016-05-22 13:57:06 +03:00
Kim Kulling
38ce71d5a0
Update glTFAsset.inl
...
closes https://github.com/assimp/assimp/issues/893 : fix invalid memcpy usage.
2016-05-19 09:10:56 +02:00
Kim Kulling
c9c6fda28e
Merge pull request #889 from ciechowoj/area_lights
...
Adds support for area lights.
2016-05-18 00:11:05 -07:00
ciechowoj
c554b55f97
Merge branch 'blender_materials'
...
Conflicts:
test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
ciechowoj
c4a542a994
Adds blender material loading.
2016-05-17 21:17:51 +02:00
Richard Selneck
fc5464eb38
Pull from upstream, 5/17/2016
2016-05-17 08:44:38 -04:00
ciechowoj
913f26475d
Adds importing blender material.
2016-05-16 21:17:58 +02:00
ciechowoj
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
Kim Kulling
560e1eebc1
fix for https://github.com/assimp/assimp/issues/887 : add missing define.
2016-05-16 11:24:04 +02:00
Kim Kulling
1acd24e0ae
iSIBImporter: fix possible dereferncing of a null pointer.
2016-05-15 19:56:29 +02:00
Kim Kulling
6575696459
OpenGEX: fix coverity findings.
2016-05-15 18:57:10 +02:00
Kim Kulling
e1084b5314
Merge branch 'feature/opengex_missing_features'
2016-05-14 10:36:46 +02:00
Kim Kulling
210182b17a
OpenGEX: fix coverity findings.
2016-05-14 10:10:05 +02:00
Otger
159af06524
Fixed GLTF bugs, and added a few test models
2016-05-10 16:25:15 +02:00
Richard Selneck
86a636fbbf
Add in IRRMESH option
2016-05-09 18:26:18 -04:00
Kim Kulling
e9085097f3
OpenGEX: add light impl and add examples.
2016-05-09 20:43:22 +02:00
Kim Kulling
0d5eb30a28
CameraObj: load camera data in the correct way.
2016-05-08 22:31:16 +02:00
Kim Kulling
82f73b6d03
OpenGEX: fix invalid access to textures. Next steps to camera and light.
2016-05-08 11:09:53 +02:00
Gorilux
00b574d746
Fixed compile issue for travis-ci
2016-05-07 15:36:05 +02:00
Gorilux
753b63c526
Removed override keywords so compilation success on gcc 4.6
2016-05-07 15:15:00 +02:00
Gorilux
89320bab46
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-07 14:18:17 +02:00
Gorilux
8f4f0047fb
Added 3MF importer
2016-05-07 14:16:33 +02:00
Alexander Gessler
0b79d1ebda
Revert previous glTF fix ( e5233283ef
) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions.
2016-05-05 19:11:33 +02:00
Alexander Gessler
f5327a99ba
Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives.
2016-05-05 19:05:02 +02:00
Alexander Gessler
e5233283ef
Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.
...
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
2016-05-05 16:37:55 +02:00
Alexander Gessler
896120b76a
Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings.
2016-05-05 15:41:50 +02:00
Alexander Gessler
167bc579c5
Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.
2016-05-05 15:41:12 +02:00
Alexander Gessler
1daae7b7b9
STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation.
2016-05-05 15:40:36 +02:00
Alexander Gessler
e7fd168114
Merge pull request #854 from tomacd/fix_scene_combiner
...
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
Kim Kulling
e9b93788ca
Merge pull request #863 from mpersano/master
...
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
Richard Selneck
12613720ff
Fix macro used for detecting IRR support
2016-05-02 18:24:26 -04:00
Kim Kulling
8449afad71
Merge pull request #868 from otgerrogla/master
...
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger
11e52dc3d7
Removed rogue comma
2016-04-28 21:34:31 +02:00
Otger
2fe401fc54
Fixed gcc compilation error
2016-04-28 21:22:01 +02:00
Otger
64f78e003f
Fixed crashes when files were not found, and fixed some warnings
2016-04-28 20:50:01 +02:00
Kim Kulling
46e7ae5dc0
OpenGEX: prepare light- and camera-node and object.
2016-04-28 20:20:40 +02:00
Otger
d9b365eb90
Fixed a few GLTF importer/exporter bugs
2016-04-28 18:44:47 +02:00
Kim Kulling
5192b837da
Replace std::endl by using backslash n.
2016-04-27 17:58:40 +02:00
Kim Kulling
7468ca5c35
VS2015-code analysis: fix finding ( index var type too small ).
2016-04-23 09:43:20 +02:00
Kim Kulling
829e56df0c
cmake env: add license info.
2016-04-23 09:42:05 +02:00
mpersano
473d2ca052
Fix texture coords exporting on binary PLY files
2016-04-22 16:09:45 -03:00
Kim Kulling
2f9c33e3e9
closes https://github.com/assimp/assimp/issues/857
2016-04-20 23:27:59 +02:00
Kim Kulling
0ec1e91722
Regression Testsuite: update database.
2016-04-19 08:49:14 +02:00
Kim Kulling
22dc22778d
Assxml exporter: Make some local functions static.
2016-04-19 08:48:37 +02:00
Kim Kulling
1b94b8969f
Blender Importer: fix review findings.
2016-04-19 08:45:04 +02:00
tomacd
5a8c15d826
fix SceneCombiner copy of aiNode not setting mParent field
2016-04-18 11:28:21 +02:00
Kim Kulling
de39c49c4c
assxml export: make local functions static.
2016-04-17 23:29:46 +02:00
Kim Kulling
a6e7938696
Assxml io function: use vsprintf for var-argument list.
2016-04-17 21:33:11 +02:00
Kim Kulling
dec93efc92
AssxmlExporter: fix crash in writing header info in VS2015.
2016-04-16 18:42:49 +02:00
Kim Kulling
6b243230b2
C++11-Support: remove boost.
2016-04-07 21:31:04 +02:00
Kim Kulling
632b58f27e
Merge pull request #850 from mensinda/no-boost
...
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
mensinda
b045a1ec5c
Deleted move constructor of LazyObject
2016-04-06 21:03:54 +02:00
mensinda
3eafc7e746
Renamed Math.h --> MathFunctions.h
2016-04-06 16:54:03 +02:00
mensinda
f59cba13eb
Try fixing clang builds
2016-04-06 11:10:12 +02:00
mensinda
726b004806
Removed boost/noncopyable.hpp
2016-04-06 10:51:18 +02:00
mensinda
51c80ecb80
Moved gcd and lcm implemetation
2016-04-06 10:21:59 +02:00
mensinda
cc0fce8568
Replaced boost::timer with std::chrono
2016-04-06 10:13:02 +02:00
mensinda
ae99f99b99
Replaced boost::tuple with std::tuple
2016-04-06 00:17:21 +02:00
mensinda
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
mensinda
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
mensinda
cff5b0d1a0
Replaced depreacated std::auto_ptr with std::unique_ptr
2016-04-05 22:56:11 +02:00
mensinda
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
mensinda
4836a2993e
Replaced boost::thread with std::thread
2016-04-05 22:28:21 +02:00
Kim Kulling
20630e950a
Regression test suite: add ui for simpler text execution.
2016-04-05 22:02:02 +02:00
Kim Kulling
a2d9cbef7e
Update STEPFileReader.cpp
...
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
Kim Kulling
f2d5921252
Update FBXConverter.cpp
...
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
Eric Engestrom
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00