Doug Stephen
00eb2e401a
Added field and getter for metadata entries to AiNode.java.
2017-10-11 10:56:40 -05:00
Doug Stephen
3ef1f37a80
Create AiMetadataEntry.java for jassimp port.
2017-10-11 10:54:27 -05:00
Kim Kulling
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
Kim Kulling
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
Jared Mulconry
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
Kim Kulling
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
Kim Kulling
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
Kim Kulling
8f141c1966
Update utObjImportExport.cpp
...
Remove unused header.
2017-10-10 18:56:37 +02:00
Kim Kulling
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
Jared Mulconry
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
Jared Mulconry
1497cc27b2
Cleaned up the whitespace again. Let's see how the cache does.
2017-10-10 22:08:13 +11:00
Jared Mulconry
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
Jared Mulconry
94e3f903e2
Merge branch 'master' into appveyor
2017-10-10 19:28:05 +10:00
Jared Mulconry
bb173749c1
Attempting to fix the directories being cached.
2017-10-10 20:11:36 +11:00
Jared Mulconry
eb46a40849
Merge branch 'master' into appveyor
2017-10-10 18:46:21 +10:00
Jared Mulconry
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
Jared Mulconry
63338c0605
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-10 18:55:57 +11:00
Kim Kulling
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
ndotl
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
Haik Lorenz
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
Jared Mulconry
469c1a068f
Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor
2017-10-09 18:52:02 +11:00
Kim Kulling
d60fe38253
Merge branch 'master' into master
2017-10-09 00:07:43 +02:00
Kim Kulling
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
b2716a9c3f
Merge branch 'master' into msvc2013_tempfile_fix
2017-10-08 19:53:53 +02:00
Kim Kulling
55cfe298b0
Merge pull request #1483 from turol/warnings
...
Fix some warnings
2017-10-08 19:45:59 +02:00
Jared Mulconry
4a915653f5
Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk.
2017-10-08 23:42:28 +11:00
Turo Lamminen
f90d874978
Open3DGC: Remove redundant const qualifiers from return types
2017-10-08 12:48:45 +03:00
Turo Lamminen
cd64eae590
GenericProperty: Remove useless const qualifier from return value
2017-10-08 12:45:48 +03:00
Turo Lamminen
7e033c6cef
FBX: Remove useless const qualifier from return value
...
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
Jared Mulconry
3b4ffbc1b6
Test failures are now getting properly reported. Turning off 'fast finish' to allow all tests to execute.
2017-10-08 19:16:03 +11:00
Jared Mulconry
d8e3952b64
Merging the test_script with test reporting was a terrible idea in retrospect. on_finish should serve the purpose.
2017-10-08 18:57:35 +11:00
Jared Mulconry
e60e396721
Attempting to address failures with chained batch and powershell commands.
2017-10-08 18:42:56 +11:00
Jared Mulconry
61836080c5
Quote escaping across nested batch and powershell hurts my brain.
2017-10-08 18:01:58 +11:00
Jared Mulconry
27b6cc22db
No fun/multiline allowed.
2017-10-08 17:51:42 +11:00
Jared Mulconry
022a34e54c
Fixing multiline batch command weirdness.
2017-10-08 17:50:11 +11:00
Jared Mulconry
54d2f25aa5
Attempting to get test results reporting even if an error occurrs.
2017-10-08 17:46:45 +11:00
Jared Mulconry
5e5b7f4f75
Refined the appveyor config so that test output is reported even if tests fail.
2017-10-08 17:06:23 +11:00
Jared Mulconry
5149149b07
The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary.
2017-10-08 16:31:46 +11:00
Jared Mulconry
58ac747634
Fixed some bad usage of environment variables.
2017-10-08 16:28:43 +11:00
Jared Mulconry
90c9884c5e
The environment section uses different syntax for a list of vars.
2017-10-08 16:24:05 +11:00
Jared Mulconry
81d3010f73
Added the mtime_cache script to hopefully improve use of incremental building with appveyor.
...
Reduced the verbosity of the appveyor config.
Added use of mtime_cache.
Fixed the output of an xml version of the test output for hooking into appveyor.
2017-10-08 16:21:32 +11:00
Jared Mulconry
52da099738
Updated test output to log to xml and to upload those results appropriately, so they show up in AppVeyor correctly as tests at the end.
2017-10-08 13:00:27 +11:00
Jared Mulconry
6a2dfb1efc
Fixed up the path to the build artifacts to be cached.
2017-10-08 12:44:54 +11:00
Jared Mulconry
3e80aabde5
Attempting to get tests to run.
2017-10-08 12:32:14 +11:00
Jared Mulconry
26851880e4
Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history.
2017-10-08 11:55:54 +11:00
Kim Kulling
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
Kim Kulling
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
Jared Mulconry
fe79322959
Attempting to get the tests detected and run.
2017-10-08 02:22:37 +11:00
Jared Mulconry
d3de8dbf5f
Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down.
2017-10-08 02:03:00 +11:00
Jared Mulconry
ba43e3a152
x86 isn't a valid VS platform. Win32 it is, then.
2017-10-08 01:55:10 +11:00