closes https://github.com/assimp/assimp/issues/1721: set camera parameters instead of nonsense.

This commit is contained in:
Kim Kulling
2018-01-24 21:20:34 +01:00
parent b43923a759
commit 0b15d5cd46
6 changed files with 41 additions and 55 deletions

View File

@@ -45,7 +45,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_FBX_IMPORTER
#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
# include <zlib.h>
#else
@@ -67,7 +66,6 @@ using namespace Assimp::FBX;
namespace {
// ------------------------------------------------------------------------------------------------
// signal parse error, this is always unrecoverable. Throws DeadlyImportError.
AI_WONT_RETURN void ParseError(const std::string& message, const Token& token) AI_WONT_RETURN_SUFFIX;
@@ -213,7 +211,6 @@ Scope::~Scope()
}
}
// ------------------------------------------------------------------------------------------------
Parser::Parser (const TokenList& tokens, bool is_binary)
: tokens(tokens)
@@ -537,18 +534,18 @@ void ReadBinaryDataArray(char type, uint32_t count, const char*& data, const cha
uint32_t stride = 0;
switch(type)
{
case 'f':
case 'i':
stride = 4;
break;
case 'f':
case 'i':
stride = 4;
break;
case 'd':
case 'l':
stride = 8;
break;
case 'd':
case 'l':
stride = 8;
break;
default:
ai_assert(false);
default:
ai_assert(false);
};
const uint32_t full_length = stride * count;