diff --git a/README.md b/README.md index 90ca6117..4de41fd6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + [![appveyor status](https://ci.appveyor.com/api/projects/status/github/huxingyi/dust3d?branch=master&svg=true)](https://ci.appveyor.com/project/huxingyi/dust3d) [![travis status](https://travis-ci.org/huxingyi/dust3d.svg?branch=master)](https://travis-ci.org/huxingyi/dust3d) [![readthedocs status](https://readthedocs.org/projects/dust3d/badge/?version=latest)](http://docs.dust3d.org/en/latest/?badge=latest) diff --git a/docs/examples/dust3dlogo/dust3dlogo.ds3 b/docs/examples/dust3dlogo/dust3dlogo.ds3 index 21b60297..d846608f 100644 --- a/docs/examples/dust3dlogo/dust3dlogo.ds3 +++ b/docs/examples/dust3dlogo/dust3dlogo.ds3 @@ -1,263 +1,282 @@ DUST3D 1.0 xml 0000000133 - + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/examples/modeling-camel/camel.ds3 b/docs/examples/modeling-camel/camel.ds3 index 528d4813..6de43ff1 100644 --- a/docs/examples/modeling-camel/camel.ds3 +++ b/docs/examples/modeling-camel/camel.ds3 @@ -1,162 +1,177 @@ DUST3D 1.0 xml 0000000193 - - + + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + ‰PNG  diff --git a/dust3d-logo.png b/dust3d-logo.png index 12246c52..8c6bada1 100644 Binary files a/dust3d-logo.png and b/dust3d-logo.png differ diff --git a/src/glbfile.cpp b/src/glbfile.cpp index 223f2944..3c4b4d6c 100644 --- a/src/glbfile.cpp +++ b/src/glbfile.cpp @@ -30,8 +30,7 @@ GlbFileWriter::GlbFileWriter(Outcome &outcome, m_filename(filename), m_outputNormal(true), m_outputAnimation(true), - m_outputUv(true), - m_testOutputAsWhole(false) + m_outputUv(true) { const std::vector> *triangleVertexNormals = outcome.triangleVertexNormals(); if (m_outputNormal) { diff --git a/src/glbfile.h b/src/glbfile.h index e8e2c1dc..b84cc045 100644 --- a/src/glbfile.h +++ b/src/glbfile.h @@ -26,7 +26,6 @@ private: bool m_outputNormal; bool m_outputAnimation; bool m_outputUv; - bool m_testOutputAsWhole; QByteArray m_binByteArray; QByteArray m_jsonByteArray; private: