OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +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

48
src/Interface/Interface_StaticStandards.cxx
View File

@@ -11,16 +11,15 @@
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
//#74 rln 10.03.99 S4135: new parameters, values and default values
// gka 10.04.99 S4136: eliminate parameter 'lastpreci'
//S4181 pdn 23.04.99: adding new parameter handling writing of elementary surfaces
#include <Interface_Static.hxx>
#include <Message_MsgFile.hxx>
#include <TCollection_ExtendedString.hxx>
//tatouage de la librairie
#include <Precision.hxx>
#include <stdio.h>
#include "../XSMessage/XSMessage_XSTEP_us.pxx"
static int deja = 0;
@@ -88,33 +87,16 @@ void Interface_Static::Standards ()
// (0 pour dire : pas codee)
//:S4136 Interface_Static::Init("std" ,"lastpreci", 'r',"0.");
// **** MESSAGERIE DE BASE ****
// Chargement "manuel" au cas ou les fichiers, env, etc sont KO
Message_MsgFile::AddMsg ("XSTEP_1","Beginning of IGES file memory loading.");
Message_MsgFile::AddMsg ("XSTEP_2","File opening error");
Message_MsgFile::AddMsg ("XSTEP_3","Reason : No such file or directory");
Message_MsgFile::AddMsg ("XSTEP_4","Reason : Not enough space");
Message_MsgFile::AddMsg ("XSTEP_5","Reason : Permission denied");
Message_MsgFile::AddMsg ("XSTEP_6","Reason : Too many open files");
Message_MsgFile::AddMsg ("XSTEP_7","Reason : Undetermined");
Message_MsgFile::AddMsg ("XSTEP_8","End of loading IGES file to memory (Elapsed time : %s).");
Message_MsgFile::AddMsg ("XSTEP_11","Internal error during the file header reading. The process continues");
Message_MsgFile::AddMsg ("XSTEP_13","Internal error during the reading of the entity %d");
Message_MsgFile::AddMsg ("XSTEP_14","Internal error during the reading of the entity %d (parameter %d)");
Message_MsgFile::AddMsg ("XSTEP_15","Total number of loaded entities : %d.");
Message_MsgFile::AddMsg ("XSTEP_16","Beginning of the model loading");
Message_MsgFile::AddMsg ("XSTEP_17","End of the model loading");
Message_MsgFile::AddMsg ("XSTEP_21","Number of ignored Null Entities : %d");
Message_MsgFile::AddMsg ("XSTEP_22","Entity %s : unknown");
Message_MsgFile::AddMsg ("XSTEP_23","Entity %s, Type %s : recovered");
Message_MsgFile::AddMsg ("XSTEP_24","Report : %d unknown entities");
Message_MsgFile::AddMsg ("XSTEP_25","Number of fail in memory loading : %d.");
Message_MsgFile::AddMsg ("XSTEP_26","Number of warning in memory loading : %d.");
// Chargement du vrai fichier langue
Message_MsgFile::LoadFromEnv ("CSF_XSMessage","XSTEP");
// load messages if needed
if (!Message_MsgFile::HasMsg ("XSTEP_1"))
{
if (!Message_MsgFile::LoadFromEnv ("CSF_XSMessage", "XSTEP"))
{
Message_MsgFile::LoadFromString (XSMessage_XSTEP_us, sizeof(XSMessage_XSTEP_us) - 1);
}
if (!Message_MsgFile::HasMsg ("XSTEP_1"))
{
Standard_ProgramError::Raise ("Critical Error - message resources for Interface_Static are invalid or undefined!");
}
}
}