v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into adsk-contrib-fix-std-stream-overflow

pull/1486/head
ndotl 2017-10-20 15:22:49 +02:00 committed by GitHub
parent c49d12cabb dbae8e497d
commit 8cf61c3c89
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.travis.sh
View File

@ -1,3 +1,10 @@
#---------------------------------------------------------------------------
#Open Asset Import Library (assimp)
#---------------------------------------------------------------------------
# Copyright (c) 2006-2017, assimp team
#
# License see LICENSE file
#
function generate() function generate()
{ {
OPTIONS="-DASSIMP_WERROR=ON" OPTIONS="-DASSIMP_WERROR=ON"
@ -32,7 +39,7 @@ function generate()
cmake -G "Unix Makefiles" $OPTIONS cmake -G "Unix Makefiles" $OPTIONS
} }
# build and run unittests, if not android
if [ $ANDROID ]; then if [ $ANDROID ]; then
ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
fi fi
@ -41,7 +48,5 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
&& make -j4 \ && make -j4 \
&& sudo make install \ && sudo make install \
&& sudo ldconfig \ && sudo ldconfig \
&& (cd test/unit; ../../bin/unit) \ && (cd test/unit; ../../bin/unit)
#&& (cd test/regression; chmod 755 run.py; ./run.py ../../bin/assimp; \
# chmod 755 result_checker.py; ./result_checker.py)
fi fi

2
Readme.md
View File

@ -119,7 +119,7 @@ Take a look into the `INSTALL` file. Our build system is CMake, if you used CMak
* [.NET](port/AssimpNET/Readme.md) * [.NET](port/AssimpNET/Readme.md)
* [Pascal](port/AssimpPascal/Readme.md) * [Pascal](port/AssimpPascal/Readme.md)
* [Javascript (Alpha)](https://github.com/makc/assimp2json) * [Javascript (Alpha)](https://github.com/makc/assimp2json)
* [Unity 3d Plugin] (https://www.assetstore.unity3d.com/en/#!/content/91777) * [Unity 3d Plugin](https://www.assetstore.unity3d.com/en/#!/content/91777)
* [JVM](https://github.com/kotlin-graphics/assimp) Full jvm port (currently supported obj, ply, stl, ~collada) * [JVM](https://github.com/kotlin-graphics/assimp) Full jvm port (currently supported obj, ply, stl, ~collada)
### Other tools ### ### Other tools ###

2
code/glTFExporter.cpp
View File

@ -834,7 +834,7 @@ void glTFExporter::ExportScene()
void glTFExporter::ExportMetadata() void glTFExporter::ExportMetadata()
{ {
glTF::AssetMetadata& asset = mAsset->asset; glTF::AssetMetadata& asset = mAsset->asset;
asset.version = 1; asset.version = "1.0";
char buffer[256]; char buffer[256];
ai_snprintf(buffer, 256, "Open Asset Import Library (assimp v%d.%d.%d)", ai_snprintf(buffer, 256, "Open Asset Import Library (assimp v%d.%d.%d)",