Andrej
2b89a3cffc
Using single quote for one character parameter in find_last_of method call
2017-05-16 21:56:49 +02:00
Kim Kulling
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
Kim Kulling
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
Kim Kulling
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
Andrej
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
Andrej
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
.
2017-05-16 15:47:57 +02:00
Andrej
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
Kim Kulling
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
Kim Kulling
7e011c92f0
Merge pull request #1269 from assimp/issue_1266
...
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
2017-05-15 21:33:42 +02:00
Kim Kulling
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
Kim Kulling
e5657bf0c5
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
...
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
Alexander Gessler
ab45dc79fa
Merge pull request #1263 from jamesgk/gltf-export
...
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
VennGrayDog
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
Alexander Gessler
24790398b9
Merge pull request #1264 from smokris/master
...
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
VennGrayDog
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
Steve Mokris
2e455b78c8
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'.
2017-05-11 15:21:37 -04:00
jamesgk
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00
Kim Kulling
9b2671b280
Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
...
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
Kim Kulling
ab19c5e3f7
Merge pull request #1258 from jamesgk/gltf-export
...
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
Kim Kulling
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
Kim Kulling
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
Kim Kulling
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
Kim Kulling
b8747fffca
Merge pull request #1259 from Squareys/fix-cmake-install
...
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
Kim Kulling
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
Squareys
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
Kim Kulling
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
Kim Kulling
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
Kim Kulling
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
Kim Kulling
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
jamesgk
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
Kim Kulling
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
Kim Kulling
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
Kim Kulling
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
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