Ryan McCampbell
a8822a2b29
Cleaned up formatting in DefaultIOSystem.cpp
2019-09-03 11:18:01 -04:00
Ryan McCampbell
0685e415ad
removed extra null character in Utf8ToWide and WideToUtf8
2019-09-03 11:18:01 -04:00
Ryan McCampbell
6c65b5b549
Cleaned up unicode code and removed fixed-size buffers
2019-09-03 11:18:01 -04:00
Ryan McCampbell
727cf0c49f
Fixed unicode on windows
2019-09-03 11:18:01 -04:00
escherstair
ceacad237f
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:00:12 +02:00
escherstair
33e71ee8df
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:59:17 +02:00
escherstair
75993ad653
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:57:58 +02:00
escherstair
53d795c1c9
possible inefficient checking for 'tlist' emptiness
2019-09-03 07:57:08 +02:00
escherstair
ec1930478c
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:56:37 +02:00
escherstair
c1d4ed7873
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:55:27 +02:00
Kim Kulling
0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose
2019-09-02 20:47:04 +02:00
Kim Kulling
b34f9839f1
Merge branch 'master' into fix-missing-scale-data
2019-08-31 12:42:40 +02:00
Malcolm Tyrrell
01d0f06d3a
Make IsVerbose accessible outside the exporter
2019-08-30 11:42:23 +01:00
escherstair
de51122639
fix regression
2019-08-29 12:09:56 +02:00
escherstair
2d0d2374c1
fix ColladaLoader::findMesh() declaration
2019-08-29 12:00:44 +02:00
escherstair
89079ead12
prefer prefix ++/-- operators for non-primitive types
2019-08-29 11:44:41 +02:00
escherstair
946d64282b
fix inefficient checking for 'url' emptiness
2019-08-29 10:58:01 +02:00
escherstair
340611785a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:57:23 +02:00
escherstair
cb2beba073
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:58 +02:00
escherstair
aec4726d21
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:21 +02:00
escherstair
b3788039df
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:55:09 +02:00
escherstair
3ef0860f30
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:54:21 +02:00
escherstair
e8ae086b35
fix function definition
2019-08-29 10:48:51 +02:00
escherstair
75fed8340d
fix function declaration
2019-08-29 10:46:50 +02:00
escherstair
a044852938
fix inefficient checking for lists emptiness
2019-08-29 10:44:19 +02:00
escherstair
ba3e4ae892
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:42:47 +02:00
escherstair
2f53d42d45
fix inefficient checking for 'SceneNode_Child' emptiness
2019-08-29 10:42:09 +02:00
escherstair
cca81e877a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:34 +02:00
escherstair
b363fa3883
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:00 +02:00
escherstair
69fce64b9c
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:40:31 +02:00
escherstair
44d7cb8177
possible inefficient checking for lists emptiness
2019-08-29 10:37:19 +02:00
escherstair
02444be251
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:36:09 +02:00
escherstair
65ba0c4b46
fix inefficient checking for lists emptiness
2019-08-29 10:30:50 +02:00
escherstair
ebb061d89c
fix inefficient check for 'mNodeElement_List' emptiness
2019-08-29 10:29:24 +02:00
escherstair
0d17315166
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:25:38 +02:00
escherstair
f009c216b6
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:24:58 +02:00
escherstair
eadbc89a1f
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:23:27 +02:00
escherstair
438b070508
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:22:50 +02:00
escherstair
805fda3df8
possible inefficient checking for 'NodeElement_List' emptiness
2019-08-29 09:05:15 +02:00
escherstair
b1f8f6ae3b
prefer prefix ++/-- operators for non-primitive types
2019-08-29 09:04:27 +02:00
escherstair
ffb30fbc85
prefer prefix ++ operator for non-primitive types
2019-08-29 09:02:19 +02:00
escherstair
789e8abfe8
prefer prefix ++ operator for non-primitive types
2019-08-29 08:44:49 +02:00
escherstair
f1e0c460ed
Prefer prefix ++ operator for non-primitive types
2019-08-29 08:43:56 +02:00
escherstair
8e90bf8381
fix inefficient checking for lists emptiness
2019-08-29 08:43:09 +02:00
escherstair
43865e6bc9
fix inefficient checking for 'url' emptiness
2019-08-29 08:34:18 +02:00
escherstair
60f2535dcd
fix inefficient check for 'SceneNode_Mesh' emptiness
2019-08-29 08:30:24 +02:00
escherstair
7d8a25993b
prefer prefix ++ operator for non-primitive types
2019-08-29 08:29:30 +02:00
escherstair
765c0e71f6
prefer prefix ++ operator for non-primitive types
2019-08-29 08:25:19 +02:00
escherstair
806bcf76b1
fix inefficient checking for lists emptiness
2019-08-29 08:23:09 +02:00
escherstair
30eb3c56c3
prefer prefix ++ operator for non-primitive types
2019-08-29 08:12:22 +02:00
escherstair
dbb498095d
function parameter 'meshid' should be passed by const reference
2019-08-29 08:05:45 +02:00
escherstair
0dd1ae0196
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:51 +02:00
escherstair
9ad7ce1129
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:08 +02:00
escherstair
a9d902946d
fix inefficient check for 'Composition' emptiness
2019-08-29 08:01:00 +02:00
Kim Kulling
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
Gordon MacPherson
43cb76653b
Removed depreciated FBX Unit and scaling code
2019-08-27 15:54:27 +01:00
Gordon MacPherson
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
Gordon MacPherson
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
Kim Kulling
0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
Gordon MacPherson
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
Gordon MacPherson
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
Gordon MacPherson
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
Kim Kulling
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
Kim Kulling
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
Kim Kulling
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
Gordon MacPherson
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00
RichardTea
b8d4ae5a7c
Add git commit, original filename to DLL PE header
...
Windows only
2019-08-21 15:54:14 +01:00
Gordon MacPherson
4bc5e8c262
Stop JoinVerticiesProcess removing bones from mesh as per #2596
...
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 19:35:44 +01:00
Kim Kulling
eb55a6a3cd
Update ScaleProcess.cpp
...
Fix review findings.
2019-08-19 20:24:01 +02:00
Gordon MacPherson
fbb34b1de1
ScaleProcess overhauled to improve compatibility with animations and unit conversion.
...
./assimp Added arguments --gs to assimp command line option to enable global scaling.
No scaling for mScale of 1.0.
Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
Ghanshyam Bhutra
f69bf5f7ed
fix for div by zero reported by address sanitizer
2019-08-16 17:04:42 -07:00
Kim Kulling
84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-16 08:47:02 +02:00
Kim Kulling
a2ee19e86d
Merge branch 'master' into collada_zae
2019-08-14 20:02:53 +02:00
ywang
3d0775eebc
respect export flag if aiJoinIdenticalVertices is not needed
2019-08-12 18:10:43 -07:00
Kim Kulling
cc8e7dcc1b
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-09 20:03:51 +02:00
Kim Kulling
f1f409d538
Merge branch 'master' into RemoveStdIterator
2019-08-09 17:43:30 +02:00
Malcolm Tyrrell
3c7a608956
Add an include.
2019-08-09 16:26:59 +01:00
Malcolm Tyrrell
181d3dd84f
Fix node chain bug.
2019-08-09 15:28:14 +01:00
Kim Kulling
2d7505b244
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-08 21:57:32 +02:00
Gordon MacPherson
74d2eb842b
Fixed armature being marked as 'limbnode'
...
This also fixes issue with root bone overwritten - which should not happen as it is a hack.
Before the behaviour would create an additional bone which would end up breaking animations completely on import.
Additionally this fixes required bones being removed.
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-08 01:02:30 +01:00
Kim Kulling
090e896ebf
Merge branch 'master' into collada_zae
2019-08-06 21:22:02 +02:00
Kim Kulling
9f5b047f7c
Merge branch 'master' into fix_export_group_as_bone
2019-08-06 19:27:37 +02:00
petrmohelnik
9330cca1cd
glTF 2.0 Lights import
...
Importing of lights according to glTF 2.0 extension KHR_lights_punctual https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual
Since glTF lights are based on PBR they use different attenuation model than conventional lights supported by assimp. It is possible to use attenuation factors in assimp to describe inverse square law fallof. But the light structure does not provide means to save range property. Therefore I resorted to use of metadata. When range parameter is present, I put it into 'PBR_LightRange' metadata of light's node. Please, see comment in glTF2Importer file.
2019-08-03 20:51:00 +02:00
Kim Kulling
83d2ec7f74
Merge branch 'master' into RemoveStdIterator
2019-08-02 10:35:59 +02:00
Minmin Gong
cfbe368d72
Remove the usage of std::iterator
2019-07-29 22:34:24 -07:00
Kim Kulling
deee43f946
Merge branch 'master' into stl-white-ambient
2019-07-29 19:31:33 +02:00
Kim Kulling
d83af91095
Update Exporter.cpp
...
Add exporter detail.
2019-07-29 09:03:29 +02:00
Kim Kulling
762e039d15
Merge branch 'master' into test_exporter_ids
2019-07-28 22:20:57 +02:00
Kim Kulling
7d74a3354d
Merge branch 'master' into fix-multiUV-export
2019-07-28 09:37:00 +02:00
RichardTea
7fc4cf1552
ASSIMP_BUILD_NO_*_EXPORTER
...
Full fix for #2557
These macros should be all-caps.
Correct the cmakelists
2019-07-26 22:17:24 +01:00
Kim Kulling
94328695d0
Merge branch 'master' into fix_export_group_as_bone
2019-07-26 11:00:04 +02:00
Kim Kulling
73914cd7e2
Update FBXExporter.cpp
...
small reformatting improvement
2019-07-26 10:55:28 +02:00
ywang
d8eaf0bc7f
cleanup empty lines
2019-07-25 15:53:57 -07:00
ywang
a6b06ad811
update
2019-07-25 15:49:41 -07:00
thomasbiang
aaaa0a02a3
use ExportProperties to customize bind pose epsilon
2019-07-25 15:49:38 -07:00
thomasbiang
0f0454c3b7
customize error rate for bind pose
2019-07-25 15:47:17 -07:00
thomasbiang
f9f408690e
use ExportProperties to customize bind pose epsilon
2019-07-25 15:45:50 -07:00
thomasbiang
2ddb00f4e0
clean up
2019-07-25 15:45:50 -07:00
thomasbiang
029338940c
customize error rate for bind pose
2019-07-25 15:45:47 -07:00
ywang
0ed9158908
update
2019-07-25 15:43:43 -07:00
thomasbiang
6e6765cae3
clean up
2019-07-25 15:43:43 -07:00
thomasbiang
c597e21b67
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
thomasbiang
9b2aac8c96
use ExportProperties to customize bind pose epsilon
2019-07-25 15:43:43 -07:00
thomasbiang
079e522eae
clean up
2019-07-25 15:43:43 -07:00
thomasbiang
8fc899035c
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
ywang
57a56b7b1d
extra layer for multi uv sets
2019-07-25 13:14:54 -07:00
RichardTea
7e8a3ec4cb
Add unit test of valid and unique Exporter IDs, rename assjson id
...
"json" is a very vague exporter ID, change to "assjson"
Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
RichardTea
e993cdc309
Merge branch 'master' into collada_zae
2019-07-25 12:42:08 +01:00
RichardTea
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
RichardTea
3016f3a725
Convert Q3BSP Importer to use ZipArchiveIOSystem
...
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
RichardTea
5c6ea5d7ba
Fix memory leak in Collada ZAE and 3MF ZipFile reading
...
Must close the file!
2019-07-25 09:54:39 +01:00
RichardTea
9e04df810e
ZipArchiveIOSystem should be sorted, fix ZipFile::Read()
...
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
2019-07-25 09:53:18 +01:00
VladimÃr VondruÅ¡
dadf5c0020
Fix white ambient in STL loader.
...
A problem that sneaked in from #1293 (f84851e893
)
due to insufficient code review, later reported in #2059 but not fixed
properly. Having a white ambient practically means all other color information
is ignored and the model stays bright white no matter how you set up your
lighting, so putting it back to how it was before the commit above.
2019-07-25 10:28:09 +02:00
RichardTea
c6620478ec
Fix GCC warnings reported by Travis
2019-07-24 16:12:06 +01:00
Pierre Anquez
17adc98eec
Fix issue #2557
2019-07-23 15:58:30 +02:00
Kim Kulling
e828dd1757
Merge branch 'master' into collada_zae
2019-07-21 14:37:12 +02:00
Kim Kulling
5895f04391
Merge branch 'master' into fix_export_custom_bindpose_error
2019-07-21 12:17:02 +02:00
Kim Kulling
41ea607739
Merge branch 'master' into collada_zae
2019-07-20 14:12:18 +02:00
Kim Kulling
ff7ec7e454
Merge branch 'master' into fix-obj-line-continuation
2019-07-20 12:07:49 +02:00
Kim Kulling
103048ff85
Update UnrealLoader.h
...
use memcpy instead of = operator for pos copy.
2019-07-20 10:10:17 +02:00
kkulling
a8019cf8d8
Unit: Fix new compiler warnings.
2019-07-19 10:38:44 +02:00
ywang
e1e9d92c01
update
2019-07-16 13:36:46 -07:00
thomasbiang
e3683e49e4
clean up
2019-07-16 13:36:45 -07:00
thomasbiang
5121a835b5
customize error rate for bind pose
2019-07-16 13:36:45 -07:00
thomasbiang
6299c58fae
use ExportProperties to customize bind pose epsilon
2019-07-16 13:34:00 -07:00
thomasbiang
6e0810d3c1
clean up
2019-07-16 13:34:00 -07:00
thomasbiang
cdf60d7423
customize error rate for bind pose
2019-07-16 13:33:59 -07:00
thomasbiang
c889699d58
set->unordered_set;unsigned int for iteration
2019-07-16 13:33:59 -07:00
thomasbiang
9210ff37f2
fix group node being exported as bone node
2019-07-16 13:33:59 -07:00
Merwan
2122dc231d
Fix line continuations in OBJ files
2019-07-16 20:37:41 +02:00
kimkulling
c1670b6a97
closes https://github.com/assimp/assimp/issues/2548 : check if weight are set or set the weight to 1.0f
2019-07-16 11:40:34 +02:00
Frooxius
bcdb173e09
- Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes
...
- Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it
- Fixed blendshapes not importing for multi-material FBX meshes with no bones
2019-07-13 22:20:47 +02:00
RichardTea
07d3a7d5b0
Fix some warnings
...
Hopefully the sorts out the MSVC2013 compiler
2019-07-12 16:02:51 +01:00
RichardTea
678dd32da3
Add missing header
2019-07-12 15:37:10 +01:00
kimkulling
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
RichardTea
2a72c9b616
Read embedded textures from Collada ZAE
2019-07-12 14:46:48 +01:00
RichardTea
ddd1e770b9
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:36:46 +01:00
RichardTea
8636d5607c
Add ZipArchiveIOSystem to CMake
2019-07-12 11:35:43 +01:00
RichardTea
d64e1bde13
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
RichardTea
2c7f607e7c
Create ZipArchiveIOSystem
...
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
2019-07-12 11:22:17 +01:00
Kim Kulling
3b3a965d2b
Delete JTImporter.h
2019-07-11 22:31:40 +02:00
Kim Kulling
b1d8398243
Delete JTImporter.cpp
...
Remove JTImorter.cpp from pull request
2019-07-11 22:31:24 +02:00
Kim Kulling
8bf1b9ac5e
Update CMakeLists.txt
...
remove jtimporter
2019-07-11 22:29:30 +02:00
Kim Kulling
82e7775d6d
Update JTImporter.cpp
...
disable unused method,.
2019-07-11 19:23:00 +02:00
Kim Kulling
da33262bcc
Update FBXConverter.cpp
...
Fix merge conflicts
2019-07-11 19:17:41 +02:00
kkulling
eb5e829436
Assjson: add json export to list of exporters.
2019-07-11 17:43:03 +02:00
kkulling
2e782f43e5
Merge branch 'master' into kimkulling_dev
2019-07-11 17:37:52 +02:00
kkulling
b463ddd399
closes https://github.com/assimp/assimp/issues/340 : start integrating assimp2json.
2019-07-11 17:37:31 +02:00
thomasbiang
d7773dcfba
set->unordered_set;unsigned int for iteration
2019-07-10 09:51:20 -07:00
thomasbiang
6b5e0a9914
fix group node being exported as bone node
2019-07-09 19:05:45 -07:00
Kim Kulling
39dc9801e0
Update ColladaLoader.cpp
...
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
Kim Kulling
a01302dd4d
Merge branch 'master' into issue_2182
2019-07-09 19:45:40 +02:00
Kim Kulling
ed6dbf9533
closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception.
2019-07-09 19:44:56 +02:00
kkulling
b87f4c03ba
Remove not needed init.
2019-07-09 11:49:59 +02:00
Kim Kulling
ae7b1f1a77
Merge branch 'master' into kimkulling_dev
2019-07-03 18:28:15 +02:00
Kim Kulling
0ec5eb752c
Update FBXConverter.cpp
...
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
Kim Kulling
1fc232effa
closes https://github.com/assimp/assimp/issues/2368 : just fix it
2019-07-02 21:46:52 +02:00
Kim Kulling
96f16c7aea
closes https://github.com/assimp/assimp/issues/2527 : use correct macro for Assimp-exporter.
2019-07-02 19:48:53 +02:00
Kim Kulling
3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix
2019-06-30 12:43:40 +02:00
Rob Conde
f5ece83f31
initial unnamed node uniqueness index outside of loop
2019-06-28 16:12:58 -04:00
Mike Samsonov
6d07473550
all textures use relative path except embedded, this is fix for it
2019-06-27 17:59:55 +01:00
Kim Kulling
05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident
2019-06-27 14:02:01 +02:00
Kim Kulling
af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision
2019-06-26 17:31:11 +02:00
Kim Kulling
853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import
2019-06-25 20:19:42 +02:00
Kim Kulling
1952144445
Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev
2019-06-24 21:46:05 +02:00
Kim Kulling
0f66a917e5
Add unittest.
2019-06-24 21:37:53 +02:00
RichardTea
8f43fb144a
Add "importerIndex" Importer property
...
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
2019-06-24 14:55:48 +01:00
Kim Kulling
26bd54ae0b
PostProcesswing: add gen-aabb process to postprocessing.
2019-06-23 20:24:32 +02:00
Kim Kulling
418c07a9bb
closes https://github.com/assimp/assimp/issues/2368 : add missign anim mesh for multimaterial meshes in fbx,.
2019-06-21 18:00:53 +02:00
RichardTea
bf252c4452
Add configuration of text format precision
...
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
2019-06-20 18:11:11 +01:00
RichardTea
59f732e10d
DAE Import: Don't use SkipElement() to skip empty Text
...
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.
Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
2019-06-20 16:30:52 +01:00
Kim Kulling
6b3d6c3b8f
JT: next steps.
2019-06-18 20:35:02 +02:00
Kim Kulling
ced080f9f3
X: fix out of bound access.
2019-06-15 19:17:15 +02:00
Kim Kulling
eb27fb753d
Merge branch 'master' into kimkulling-patch-3
2019-06-15 13:44:13 +02:00
Rahul Sheth
6c33374491
update install interface location
2019-06-13 22:08:34 -07:00
Rahul Sheth
d00f4f4b3a
Build Hunter-compatible config file
2019-06-13 21:34:47 -07:00
Rahul Sheth
5cda81e84b
code fixes for Hunter-based build
2019-06-13 21:32:37 -07:00
Rahul Sheth
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
Rahul Sheth
a4587e8609
Use hunter to download dependencies if HUNTER_ENABLED is ON
2019-06-13 21:31:24 -07:00
Kim Kulling
ba29b8f1da
Merge branch 'master' into patch-1
2019-06-13 13:41:40 +02:00
Kim Kulling
0021c93892
closes https://github.com/assimp/assimp/issues/2431 : use irrXml directly for mingw compiler.
2019-06-12 22:12:38 +02:00
Kim Kulling
66f693a6a4
Update IRRLoader.cpp
...
fix case-sensitive typo.
2019-06-12 10:25:11 +02:00
Kim Kulling
e914b9531b
Update IRRLoader.h
...
fix case-sensity typo.
2019-06-12 00:55:06 +02:00
Kim Kulling
4dcb3c9235
Update ImporterRegistry.cpp
...
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
Kim Kulling
fc065d8ab4
Merge branch 'master' into reorg
2019-06-11 20:59:46 +02:00
Kim Kulling
a6e3fc3fd9
Fix case-sensitive folder name for unix platforms.
2019-06-11 20:54:01 +02:00
Kim Kulling
cc10967913
Fix the build.
2019-06-11 20:17:50 +02:00
PK
d448b49ae1
fixed MSVC toolset versions >140
...
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
Kim Kulling
f76d77955d
Merge branch 'master' into reorg
2019-06-11 00:22:50 +02:00
Kim Kulling
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
Kim Kulling
7e20356a20
Update XFileParser.cpp
...
Fix exception.
2019-06-10 20:32:56 +02:00
Kim Kulling
6fc42cb898
Merge branch 'master' into kimkulling-patch-3
2019-06-10 00:39:05 +02:00
Kim Kulling
a4bda3a205
Update XFileParser.cpp
...
Test
2019-06-09 21:25:25 +02:00
Kim Kulling
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
petrmohelnik
83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays
2019-06-09 15:52:32 +02:00
Kim Kulling
cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing
2019-06-08 21:31:47 +02:00
Kim Kulling
4a46717a77
Merge branch 'master' into kimkulling-patch-3
2019-06-08 09:09:37 +02:00
Arkeon
5679dd435a
Prevent crash when Ogre skeleton file is missing
2019-06-07 09:49:24 +02:00
Kim Kulling
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
Kim Kulling
589a306c85
Merge branch 'master' into code-chmod-644
2019-06-06 09:16:07 +02:00