85b1181486
Merge branch 'master' into unitTestObj
2017-10-18 09:39:04 +02:00
d997ea961a
Merge pull request #1499 from ihmcrobotics/feature/collada-up_axis-api-improvements
...
Add Node metadata to the Jassmip Java API
2017-10-17 20:26:00 +02:00
42e2c30b4b
Added helper getters for casting metadata payloads
2017-10-17 11:04:51 -05:00
1aa15c8069
Fix header and remove old debug code
2017-10-17 10:35:50 -05:00
100fa76a90
Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements
2017-10-17 10:29:03 -05:00
ff758e4c15
OBJ : add unit test to validate relative indices
2017-10-16 20:35:02 +02:00
9d2bcb56c7
Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license
2017-10-16 12:43:35 -05:00
82debbf54a
Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README
2017-10-16 12:41:50 -05:00
b2eb599176
Update ColladaExporter.cpp
...
Retrigger travis.
2017-10-16 18:51:25 +02:00
44ad80201c
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-14 21:47:21 +02:00
82b269c424
Merge pull request #1480 from turol/ubsan
...
Undefined Behavior sanitizer
2017-10-14 19:25:43 +03:00
f8c4002294
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
2017-10-14 18:46:19 +03:00
9a6b141568
FBX: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7cbb5f4d3b
B3DImporter: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7b73fe8b02
Travis: Add Clang UBSan build configuration
2017-10-14 18:46:19 +03:00
6efe4e2841
CMake: Add support for Undefined Behavior sanitizer
2017-10-14 18:46:19 +03:00
8e7f476490
Merge pull request #1494 from assimp/invalid_normals_in_unittest
...
UnitTest: use correct initialized normals in unittest.
2017-10-14 17:45:30 +02:00
1767663071
Merge branch 'master' into invalid_normals_in_unittest
2017-10-14 17:06:57 +02:00
5a15226a95
Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader
...
Feature/jassimp IO system
2017-10-14 17:04:26 +02:00
f56e28ea3c
UnitTest: use correct initialized normals in unittest.
2017-10-14 16:40:39 +02:00
5e739acfa1
Merge branch 'master' into feature/jassimp-classloader
2017-10-14 15:59:55 +02:00
01510dfe1b
Merge pull request #1491 from assimp/fix_blender_overflow
...
Blender: fix short overflow.
2017-10-14 10:44:00 +02:00
e662f2dc6f
Blender: fix short overflow.
2017-10-13 22:41:38 +02:00
5e00d4d5cb
Populate metadata on Java objects.
2017-10-11 11:07:49 -05:00
a7c1dde56e
Added return statement to Write
2017-10-11 11:04:52 -05:00
0229a3acf3
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
2017-10-11 11:04:52 -05:00
33a54f021e
Fix small bug in getStaticField
2017-10-11 11:03:29 -05:00
00eb2e401a
Added field and getter for metadata entries to AiNode.java.
2017-10-11 10:56:40 -05:00
3ef1f37a80
Create AiMetadataEntry.java for jassimp port.
2017-10-11 10:54:27 -05:00
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
114c48bbcf
Merge pull request #1479 from jaredmulconry/appveyor
...
AppVeyor cleanup and Addition of VS 2017 and running Tests
2017-10-11 10:58:17 +02:00
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
c3074a81ca
Merge pull request #1464 from assimp/issue_1453
...
Obj: prepare test to reproduce crash on linux.
2017-10-10 19:51:20 +02:00
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
8f141c1966
Update utObjImportExport.cpp
...
Remove unused header.
2017-10-10 18:56:37 +02:00
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
fa91a0f64c
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
2017-10-10 22:45:45 +11:00
1497cc27b2
Cleaned up the whitespace again. Let's see how the cache does.
2017-10-10 22:08:13 +11:00
dce2be9e09
I think I've worked out where the obj's are located. We shall see if the cache picks them up.
2017-10-10 21:24:56 +11:00
94e3f903e2
Merge branch 'master' into appveyor
2017-10-10 19:28:05 +10:00
bb173749c1
Attempting to fix the directories being cached.
2017-10-10 20:11:36 +11:00
eb46a40849
Merge branch 'master' into appveyor
2017-10-10 18:46:21 +10:00
b8ad03baa1
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
2017-10-10 19:45:57 +11:00
63338c0605
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-10 18:55:57 +11:00
ffaa42af79
Merge pull request #1482 from TransformAndLighting/master
...
Added alternative displacement texture token in OBJ MTL material.
2017-10-09 19:38:16 +02:00
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
7353d25c13
Prevent failing stringstream to crash the export process
...
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).
The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
469c1a068f
Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor
2017-10-09 18:52:02 +11:00
d60fe38253
Merge branch 'master' into master
2017-10-09 00:07:43 +02:00
21add21ab1
Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix
...
Fixed File Size reported as 0 in tests that use temporary files
2017-10-09 00:06:57 +02:00
Kim Kulling
Doug Stephen
Alexandre Avenel
Jesper Smith
turol
Jared Mulconry
Turo Lamminen
Kim Kulling
ndotl
Haik Lorenz