Kim Kulling [Wed, 18 Oct 2017 11:54:14 +0000 (13:54 +0200)]
Merge pull request #1497 from ihmcrobotics/feature/jassimp-classloader-license
Changed license header for IHMC contributions from Apache 2.0 to BSD
Kim Kulling [Wed, 18 Oct 2017 07:58:37 +0000 (09:58 +0200)]
Merge branch 'master' into feature/jassimp-classloader-license
Kim Kulling [Wed, 18 Oct 2017 07:58:10 +0000 (09:58 +0200)]
Merge pull request #1496 from aavenel/unitTestObj
OBJ : add unit test to validate relative indices
Kim Kulling [Wed, 18 Oct 2017 07:39:04 +0000 (09:39 +0200)]
Merge branch 'master' into unitTestObj
Kim Kulling [Tue, 17 Oct 2017 18:26:00 +0000 (20:26 +0200)]
Merge pull request #1499 from ihmcrobotics/feature/collada-up_axis-api-improvements
Add Node metadata to the Jassmip Java API
Doug Stephen [Tue, 17 Oct 2017 16:04:51 +0000 (11:04 -0500)]
Added helper getters for casting metadata payloads
Doug Stephen [Tue, 17 Oct 2017 15:35:50 +0000 (10:35 -0500)]
Fix header and remove old debug code
Doug Stephen [Tue, 17 Oct 2017 15:29:03 +0000 (10:29 -0500)]
Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements
Alexandre Avenel [Sun, 15 Oct 2017 17:53:26 +0000 (19:53 +0200)]
OBJ : add unit test to validate relative indices
Jesper Smith [Mon, 16 Oct 2017 17:43:35 +0000 (12:43 -0500)]
Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license
Jesper Smith [Mon, 16 Oct 2017 17:41:50 +0000 (12:41 -0500)]
Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README
turol [Sat, 14 Oct 2017 16:25:43 +0000 (19:25 +0300)]
Merge pull request #1480 from turol/ubsan
Undefined Behavior sanitizer
Jared Mulconry [Sat, 14 Oct 2017 11:45:00 +0000 (22:45 +1100)]
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
Turo Lamminen [Sat, 7 Oct 2017 17:40:35 +0000 (20:40 +0300)]
FBX: Replace bad pointer casting with memcpy
Turo Lamminen [Sat, 7 Oct 2017 15:36:09 +0000 (18:36 +0300)]
B3DImporter: Replace bad pointer casting with memcpy
Turo Lamminen [Sat, 7 Oct 2017 14:47:06 +0000 (17:47 +0300)]
Travis: Add Clang UBSan build configuration
Turo Lamminen [Sat, 7 Oct 2017 14:13:08 +0000 (17:13 +0300)]
CMake: Add support for Undefined Behavior sanitizer
Kim Kulling [Sat, 14 Oct 2017 15:45:30 +0000 (17:45 +0200)]
Merge pull request #1494 from assimp/invalid_normals_in_unittest
UnitTest: use correct initialized normals in unittest.
Kim Kulling [Sat, 14 Oct 2017 15:06:57 +0000 (17:06 +0200)]
Merge branch 'master' into invalid_normals_in_unittest
Kim Kulling [Sat, 14 Oct 2017 15:04:26 +0000 (17:04 +0200)]
Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader
Feature/jassimp IO system
Kim Kulling [Sat, 14 Oct 2017 14:40:39 +0000 (16:40 +0200)]
UnitTest: use correct initialized normals in unittest.
Kim Kulling [Sat, 14 Oct 2017 13:59:55 +0000 (15:59 +0200)]
Merge branch 'master' into feature/jassimp-classloader
Kim Kulling [Sat, 14 Oct 2017 08:44:00 +0000 (10:44 +0200)]
Merge pull request #1491 from assimp/fix_blender_overflow
Blender: fix short overflow.
Kim Kulling [Fri, 13 Oct 2017 20:41:38 +0000 (22:41 +0200)]
Blender: fix short overflow.
Doug Stephen [Wed, 11 Oct 2017 16:07:49 +0000 (11:07 -0500)]
Populate metadata on Java objects.
Jesper Smith [Fri, 28 Jul 2017 20:08:59 +0000 (15:08 -0500)]
Added return statement to Write
Jesper Smith [Thu, 27 Jul 2017 22:42:01 +0000 (17:42 -0500)]
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
Doug Stephen [Wed, 11 Oct 2017 16:03:29 +0000 (11:03 -0500)]
Fix small bug in getStaticField
Doug Stephen [Wed, 11 Oct 2017 15:56:40 +0000 (10:56 -0500)]
Added field and getter for metadata entries to AiNode.java.
Doug Stephen [Wed, 11 Oct 2017 15:54:27 +0000 (10:54 -0500)]
Create AiMetadataEntry.java for jassimp port.
Kim Kulling [Wed, 11 Oct 2017 08:58:17 +0000 (10:58 +0200)]
Merge pull request #1479 from jaredmulconry/appveyor
AppVeyor cleanup and Addition of VS 2017 and running Tests
Jared Mulconry [Wed, 11 Oct 2017 08:06:29 +0000 (19:06 +1100)]
Merge branch 'master' of github.com:assimp/assimp into appveyor
Kim Kulling [Tue, 10 Oct 2017 17:51:20 +0000 (19:51 +0200)]
Merge pull request #1464 from assimp/issue_1453
Obj: prepare test to reproduce crash on linux.
Kim Kulling [Tue, 10 Oct 2017 16:56:37 +0000 (18:56 +0200)]
Update utObjImportExport.cpp
Remove unused header.
Kim Kulling [Tue, 10 Oct 2017 16:20:22 +0000 (18:20 +0200)]
Merge branch 'master' into issue_1453
Jared Mulconry [Tue, 10 Oct 2017 11:45:45 +0000 (22:45 +1100)]
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
Jared Mulconry [Tue, 10 Oct 2017 11:08:13 +0000 (22:08 +1100)]
Cleaned up the whitespace again. Let's see how the cache does.
Jared Mulconry [Tue, 10 Oct 2017 10:24:40 +0000 (21:24 +1100)]
I think I've worked out where the obj's are located. We shall see if the cache picks them up.
Jared Mulconry [Tue, 10 Oct 2017 09:28:05 +0000 (19:28 +1000)]
Merge branch 'master' into appveyor
Jared Mulconry [Tue, 10 Oct 2017 09:11:21 +0000 (20:11 +1100)]
Attempting to fix the directories being cached.
Jared Mulconry [Tue, 10 Oct 2017 08:46:21 +0000 (18:46 +1000)]
Merge branch 'master' into appveyor
Jared Mulconry [Tue, 10 Oct 2017 08:45:57 +0000 (19:45 +1100)]
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
Jared Mulconry [Tue, 10 Oct 2017 07:55:57 +0000 (18:55 +1100)]
Merge branch 'master' of github.com:assimp/assimp into appveyor
Kim Kulling [Mon, 9 Oct 2017 17:38:16 +0000 (19:38 +0200)]
Merge pull request #1482 from TransformAndLighting/master
Added alternative displacement texture token in OBJ MTL material.
Jared Mulconry [Mon, 9 Oct 2017 07:52:02 +0000 (18:52 +1100)]
Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor
Kim Kulling [Sun, 8 Oct 2017 22:07:43 +0000 (00:07 +0200)]
Merge branch 'master' into master
Kim Kulling [Sun, 8 Oct 2017 22:06:57 +0000 (00:06 +0200)]
Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix
Fixed File Size reported as 0 in tests that use temporary files
Kim Kulling [Sun, 8 Oct 2017 17:53:53 +0000 (19:53 +0200)]
Merge branch 'master' into msvc2013_tempfile_fix
Kim Kulling [Sun, 8 Oct 2017 17:45:59 +0000 (19:45 +0200)]
Merge pull request #1483 from turol/warnings
Fix some warnings
Jared Mulconry [Sun, 8 Oct 2017 12:42:28 +0000 (23:42 +1100)]
Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk.
Turo Lamminen [Sun, 8 Oct 2017 09:48:45 +0000 (12:48 +0300)]
Open3DGC: Remove redundant const qualifiers from return types
Turo Lamminen [Sun, 8 Oct 2017 09:45:48 +0000 (12:45 +0300)]
GenericProperty: Remove useless const qualifier from return value
Turo Lamminen [Sun, 8 Oct 2017 09:45:02 +0000 (12:45 +0300)]
FBX: Remove useless const qualifier from return value
const qualifier on primitive return type does nothing.
Jared Mulconry [Sun, 8 Oct 2017 08:16:03 +0000 (19:16 +1100)]
Test failures are now getting properly reported. Turning off 'fast finish' to allow all tests to execute.
Jared Mulconry [Sun, 8 Oct 2017 07:57:35 +0000 (18:57 +1100)]
Merging the test_script with test reporting was a terrible idea in retrospect. on_finish should serve the purpose.
Jared Mulconry [Sun, 8 Oct 2017 07:42:56 +0000 (18:42 +1100)]
Attempting to address failures with chained batch and powershell commands.
Jared Mulconry [Sun, 8 Oct 2017 07:01:58 +0000 (18:01 +1100)]
Quote escaping across nested batch and powershell hurts my brain.
Jared Mulconry [Sun, 8 Oct 2017 06:51:42 +0000 (17:51 +1100)]
No fun/multiline allowed.
Jared Mulconry [Sun, 8 Oct 2017 06:50:11 +0000 (17:50 +1100)]
Fixing multiline batch command weirdness.
Jared Mulconry [Sun, 8 Oct 2017 06:46:45 +0000 (17:46 +1100)]
Attempting to get test results reporting even if an error occurrs.
Jared Mulconry [Sun, 8 Oct 2017 06:06:23 +0000 (17:06 +1100)]
Refined the appveyor config so that test output is reported even if tests fail.
Jared Mulconry [Sun, 8 Oct 2017 05:31:46 +0000 (16:31 +1100)]
The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary.
Jared Mulconry [Sun, 8 Oct 2017 05:28:43 +0000 (16:28 +1100)]
Fixed some bad usage of environment variables.
Jared Mulconry [Sun, 8 Oct 2017 05:24:05 +0000 (16:24 +1100)]
The environment section uses different syntax for a list of vars.
Jared Mulconry [Sun, 8 Oct 2017 05:21:32 +0000 (16:21 +1100)]
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.
Jared Mulconry [Sun, 8 Oct 2017 02:00:27 +0000 (13:00 +1100)]
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.
Jared Mulconry [Sun, 8 Oct 2017 01:44:54 +0000 (12:44 +1100)]
Fixed up the path to the build artifacts to be cached.
Jared Mulconry [Sun, 8 Oct 2017 01:32:14 +0000 (12:32 +1100)]
Attempting to get tests to run.
Jared Mulconry [Sun, 8 Oct 2017 00:55:54 +0000 (11:55 +1100)]
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.
Kim Kulling [Sat, 7 Oct 2017 17:08:52 +0000 (19:08 +0200)]
Merge branch 'master' into issue_1453
Kim Kulling [Sat, 7 Oct 2017 17:08:20 +0000 (19:08 +0200)]
Reproduce issue and remove assertion when a nullptr makes more sence
Jared Mulconry [Sat, 7 Oct 2017 15:22:37 +0000 (02:22 +1100)]
Attempting to get the tests detected and run.
Jared Mulconry [Sat, 7 Oct 2017 15:03:00 +0000 (02:03 +1100)]
Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down.
Jared Mulconry [Sat, 7 Oct 2017 14:55:10 +0000 (01:55 +1100)]
x86 isn't a valid VS platform. Win32 it is, then.
Jared Mulconry [Sat, 7 Oct 2017 14:47:08 +0000 (01:47 +1100)]
Replaced the worker image name, which doesn't work as generator name, with a manually created generator name.
Jared Mulconry [Sat, 7 Oct 2017 14:34:02 +0000 (00:34 +1000)]
Merge branch 'master' into appveyor
Jared Mulconry [Sat, 7 Oct 2017 14:33:48 +0000 (01:33 +1100)]
Apparently @ escaping batch commands doesn't work in this context.
Jared Mulconry [Sat, 7 Oct 2017 14:27:21 +0000 (01:27 +1100)]
Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.
turol [Sat, 7 Oct 2017 13:29:59 +0000 (16:29 +0300)]
Merge pull request #1478 from turol/travis
Travis refactoring
Turo Lamminen [Sat, 7 Oct 2017 12:41:16 +0000 (15:41 +0300)]
Travis: Remove old attempt at disabling default configurations
This didn't actually work and now the default configurations are important.
Turo Lamminen [Sat, 7 Oct 2017 12:39:54 +0000 (15:39 +0300)]
Travis: Remove redundant config
Turo Lamminen [Sat, 7 Oct 2017 12:37:45 +0000 (15:37 +0300)]
Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious
Turo Lamminen [Sat, 7 Oct 2017 12:36:54 +0000 (15:36 +0300)]
Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 12:08:41 +0000 (15:08 +0300)]
Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better
Turo Lamminen [Sat, 7 Oct 2017 12:08:02 +0000 (15:08 +0300)]
Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 12:06:46 +0000 (15:06 +0300)]
Travis: ASAN is now implicitly off, disable explicit off
Turo Lamminen [Sat, 7 Oct 2017 11:59:12 +0000 (14:59 +0300)]
CMake: Be more verbose about enabled options
Turo Lamminen [Sat, 7 Oct 2017 11:47:52 +0000 (14:47 +0300)]
Travis: Refactor how we build CMake options
Turo Lamminen [Sat, 7 Oct 2017 11:33:34 +0000 (14:33 +0300)]
Travis: Remove unused LINUX env variable
Marco Di Benedetto [Sat, 7 Oct 2017 10:36:02 +0000 (12:36 +0200)]
added additional displacement texture token.
turol [Fri, 6 Oct 2017 16:19:56 +0000 (19:19 +0300)]
Merge pull request #1477 from turol/clang
Enable Travis clang build
Jared Mulconry [Fri, 6 Oct 2017 09:32:33 +0000 (20:32 +1100)]
Fixed warnings on MSVC caused by implicit conversions from double to float.
Turo Lamminen [Thu, 5 Oct 2017 09:51:08 +0000 (12:51 +0300)]
OpenGEXImporter: Copy materials to scene
Turo Lamminen [Thu, 5 Oct 2017 09:43:49 +0000 (12:43 +0300)]
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:38:44 +0000 (12:38 +0300)]
OpenGEXImporter: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 09:35:17 +0000 (12:35 +0300)]
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:09:26 +0000 (12:09 +0300)]
AMFImporter: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:56:13 +0000 (11:56 +0300)]
UnrealLoader: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 08:55:58 +0000 (11:55 +0300)]
utRemoveVCProcess: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:33:27 +0000 (11:33 +0300)]
utMetadata: Fix memory leak