OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0027258: Configuration - generate built-in replacement for mandatory resource files

Browse Source 
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:
ski
2016-10-28 14:29:58 +03:00
committed by apn
parent 30f5e1a74b
commit ee5befae97
62 changed files with 5075 additions and 2137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/UnitsAPI/UnitsAPI.cxx
View File

@@ -38,36 +38,6 @@ static UnitsAPI_SystemUnits currentSystem = UnitsAPI_DEFAULT;
void UnitsAPI::CheckLoading (const UnitsAPI_SystemUnits aSystemUnits)
{
if( currentSystem != aSystemUnits || CurrentUnits.IsNull()) {
OSD_Environment env1("CSF_UnitsLexicon");
TCollection_AsciiString slexiconfile(env1.Value());
if( slexiconfile.Length() > 0 )
Units::LexiconFile(slexiconfile.ToCString());
else {
OSD_Environment CasRootEnv("CASROOT");
TCollection_AsciiString CasRootString(CasRootEnv.Value());
if (CasRootString.Length() > 0 ) {
CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
Units::LexiconFile(CasRootString.ToCString());
}
else {
Standard_NoSuchObject::Raise("environment variable CSF_UnitsLexicon undefined");
}
}
OSD_Environment env2("CSF_UnitsDefinition");
TCollection_AsciiString sunitsfile(env2.Value());
if( sunitsfile.Length() > 0 )
Units::UnitsFile(sunitsfile.ToCString());
else {
OSD_Environment CasRootEnv("CASROOT");
TCollection_AsciiString CasRootString(CasRootEnv.Value());
if (CasRootString.Length() > 0 ) {
CasRootString += "/src/UnitsAPI/Units.dat";
Units::UnitsFile(CasRootString.ToCString());
}
else {
Standard_NoSuchObject::Raise("environment variable CSF_UnitsDefinition undefined");
}
}
switch (aSystemUnits) {
case UnitsAPI_DEFAULT :
if( !CurrentUnits.IsNull() ) break;