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

Fix merge issues

pull/5660/head
Kim Kulling 2024-07-10 11:42:23 +02:00
parent 47b039294f
commit 565b7f6d56
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/AssetLib/ASE/ASEParser.cpp
View File

@ -892,8 +892,8 @@ void Parser::ParseLV1ObjectBlock(ASE::BaseNode &node) {
void Parser::ParseLV2CameraSettingsBlock(ASE::Camera &camera) { void Parser::ParseLV2CameraSettingsBlock(ASE::Camera &camera) {
AI_ASE_PARSER_INIT(); AI_ASE_PARSER_INIT();
while (true) { while (true) {
if ('*' == *filePtr) { if ('*' == *mFilePtr) {
++filePtr; ++mFilePtr;
if (TokenMatch(mFilePtr, "CAMERA_NEAR", 11)) { if (TokenMatch(mFilePtr, "CAMERA_NEAR", 11)) {
ParseLV4MeshReal(camera.mNear); ParseLV4MeshReal(camera.mNear);
continue; continue;
@ -1895,7 +1895,7 @@ void Parser::ParseLV4MeshReal(ai_real &fOut) {
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Parser::ParseLV4MeshFloat(float &fOut) { void Parser::ParseLV4MeshFloat(float &fOut) {
// skip spaces and tabs // skip spaces and tabs
if (!SkipSpaces(&filePtr, mEnd)) { if (!SkipSpaces(&mFilePtr, mEnd)) {
// LOG // LOG
LogWarning("Unable to parse float: unexpected EOL [#1]"); LogWarning("Unable to parse float: unexpected EOL [#1]");
fOut = 0.0; fOut = 0.0;
@ -1903,7 +1903,7 @@ void Parser::ParseLV4MeshFloat(float &fOut) {
return; return;
} }
// parse the first float // parse the first float
filePtr = fast_atoreal_move<float>(filePtr, fOut); mFilePtr = fast_atoreal_move<float>(mFilePtr, fOut);
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void Parser::ParseLV4MeshLong(unsigned int &iOut) { void Parser::ParseLV4MeshLong(unsigned int &iOut) {