OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Coding, GLTF - Isolate RapidJSon part #192

Browse Source 
Regression after #184 where some methods are not isolated.
This commit is contained in:
dpasukhi 2024-12-14 12:21:50 +00:00
parent 673e133a51
commit 25906563a3
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/RWGltf/RWGltf_GltfJsonParser.cxx
View File

@ -35,6 +35,10 @@
#ifdef HAVE_RAPIDJSON #ifdef HAVE_RAPIDJSON
namespace namespace
{ {
// Auxiliary macros for formatting message.
#define reportGltfError(theMsg) reportGltfSyntaxProblem(TCollection_AsciiString() + theMsg, Message_Fail);
#define reportGltfWarning(theMsg) reportGltfSyntaxProblem(TCollection_AsciiString() + theMsg, Message_Warning);
//! Material extension. //! Material extension.
static const char THE_KHR_materials_common[] = "KHR_materials_common"; static const char THE_KHR_materials_common[] = "KHR_materials_common";
static const char THE_KHR_binary_glTF[] = "KHR_binary_glTF"; static const char THE_KHR_binary_glTF[] = "KHR_binary_glTF";
@ -416,21 +420,6 @@ void RWGltf_GltfJsonParser::GltfElementMap::Init (const TCollection_AsciiString&
} }
} }
} }
#endif
// Auxiliary macros for formatting message.
#define reportGltfError(theMsg) reportGltfSyntaxProblem(TCollection_AsciiString() + theMsg, Message_Fail);
#define reportGltfWarning(theMsg) reportGltfSyntaxProblem(TCollection_AsciiString() + theMsg, Message_Warning);
// =======================================================================
// function : reportGltfSyntaxProblem
// purpose :
// =======================================================================
void RWGltf_GltfJsonParser::reportGltfSyntaxProblem (const TCollection_AsciiString& theMsg,
Message_Gravity theGravity) const
{
Message::Send (myErrorPrefix + theMsg, theGravity);
}
// ======================================================================= // =======================================================================
// function : parseTransformationMatrix // function : parseTransformationMatrix
@ -595,6 +584,17 @@ bool RWGltf_GltfJsonParser::parseTransformationComponents(const TCollection_Asci
} }
return true; return true;
} }
#endif
// =======================================================================
// function : reportGltfSyntaxProblem
// purpose :
// =======================================================================
void RWGltf_GltfJsonParser::reportGltfSyntaxProblem (const TCollection_AsciiString& theMsg,
Message_Gravity theGravity) const
{
Message::Send (myErrorPrefix + theMsg, theGravity);
}
// ======================================================================= // =======================================================================
// function : RWGltf_GltfJsonParser // function : RWGltf_GltfJsonParser

8
src/RWGltf/RWGltf_GltfJsonParser.hxx
View File

@ -406,10 +406,6 @@ protected:
const RWGltf_JsonValue* myRoot; const RWGltf_JsonValue* myRoot;
}; };
#endif
protected:
//! Print message about invalid glTF syntax.
void reportGltfSyntaxProblem (const TCollection_AsciiString& theMsg, Message_Gravity theGravity) const;
private: private:
//! Parse transformation matrix of the node. //! Parse transformation matrix of the node.
@ -438,6 +434,10 @@ private:
const RWGltf_JsonValue* theScaleVal, const RWGltf_JsonValue* theScaleVal,
const RWGltf_JsonValue* theTranslationVal, const RWGltf_JsonValue* theTranslationVal,
TopLoc_Location& theResult) const; TopLoc_Location& theResult) const;
#endif
protected:
//! Print message about invalid glTF syntax.
void reportGltfSyntaxProblem (const TCollection_AsciiString& theMsg, Message_Gravity theGravity) const;
protected: protected:
TopTools_SequenceOfShape* myRootShapes; //!< sequence of result root shapes TopTools_SequenceOfShape* myRootShapes; //!< sequence of result root shapes