mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-09-18 14:27:39 +03:00
0027258: Configuration - generate built-in replacement for mandatory resource files
Generation of header files from resource files was added to CMake and genproj procedures. Message_MsgFile has been extended with new method ::LoadFromString() for loading messages from embedded resources. Message_MsgFile::LoadFromString() is now a preferred way for loading message resources by application as alternative to environment variables. TObje/TObj.msg is now embedded into TObj_Application.cxx. TObj_Application now loads its global messages on instantiation of the first class instance. UnitsAPI/Lexi_Expr.dat now completely embedded into Units_Lexicon.cxx. UnitsAPI/Units.dat now embedded into Units_UnitsDictionary.cxx but can be regenerated from resource file. The definition of the following units have been removed: benne à charbon, calorie (diététique). Unused message files XSMessage/IGES.us and IGES.fr have been removed. Related code IGESData.cxx has been removed as well. XSMessage/XSTEP.us is now embedded into Interface_StaticStandards.cxx and used for fallback initialization in case when file resources defined by CSF_XSMessage environment variable are missing. SHMessage/SHAPE.us is now embedded into ShapeExtend.cxx and used for fallback initialization in case when file resources defined by CSF_XHMessage environment variable are missing. Duplicating code has been removed from ShapeProcess_OperLibrary.cxx. Shaders/Declarations.glsl and Shaders/DeclarationsImpl.glsl are now embedded into OpenGl_ShaderProgram.cxx. CSF_ShadersDirectory is no more required for using OCCT 3D Viewer. Ray-Tracing GLSL programs from Shaders are now embedded into OpenGl_View_Raytrace.cxx. File resources are still used instead of embedded programs when CSF_ShadersDirectory is defined, but this functionality is intended for OCCT development. Enumeration Graphic3d_ShaderProgram::ShaderName_Phong demonstrating custom GLSL program usage has been removed.
This commit is contained in:
@@ -23,10 +23,13 @@
|
||||
#include <TColStd_SequenceOfExtendedString.hxx>
|
||||
#include <CDM_COutMessageDriver.hxx>
|
||||
#include <Message_Msg.hxx>
|
||||
#include <Message_MsgFile.hxx>
|
||||
#include <Resource_Manager.hxx>
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "TObj_TObj_msg.pxx"
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(TObj_Application,TDocStd_Application)
|
||||
|
||||
//=======================================================================
|
||||
@@ -47,6 +50,16 @@ Handle(TObj_Application) TObj_Application::GetInstance()
|
||||
|
||||
TObj_Application::TObj_Application () : myIsError(Standard_False)
|
||||
{
|
||||
if (!Message_MsgFile::HasMsg ("TObj_Appl_SUnknownFailure"))
|
||||
{
|
||||
// load messages into global map on first instantiation
|
||||
Message_MsgFile::LoadFromString (TObj_TObj_msg, sizeof(TObj_TObj_msg) - 1);
|
||||
if (!Message_MsgFile::HasMsg ("TObj_Appl_SUnknownFailure"))
|
||||
{
|
||||
Standard_ProgramError::Raise ("Critical Error - message resources for TObj_Application are invalid or undefined!");
|
||||
}
|
||||
}
|
||||
|
||||
myMessenger = new Message_Messenger;
|
||||
myIsVerbose = Standard_False;
|
||||
}
|
||||
|
Reference in New Issue
Block a user