0024241: Adding shaders directory to OCCT resources

Shaders resource directory was added

diff --git a/src/WOKTclLib/templates/env.bat b/src/WOKTclLib/templates/env.bat
index 69b92f1f6514ddedfed2768c49b4b4fa6734d257..77c4b1f395c11071f4e96dffe4a3172cc9ca33eb 100644 (file)
--- a/src/WOKTclLib/templates/env.bat
+++ b/src/WOKTclLib/templates/env.bat
@@ -110,6 +110,7 @@ set MMGT_CLEAR=1
 set CSF_EXCEPTION_PROMPT=1
 set "CSF_SHMessage=%CASROOT%\src\SHMessage"
 set "CSF_MDTVTexturesDirectory=%CASROOT%\src\Textures"
+set "CSF_ShadersDirectory=%CASROOT%\src\Shaders"
 set "CSF_XSMessage=%CASROOT%\src\XSMessage"
 set "CSF_TObjMessage=%CASROOT%\src\TObj"
 set "CSF_StandardDefaults=%CASROOT%\src\StdResource"

diff --git a/src/WOKTclLib/templates/env.bat.in b/src/WOKTclLib/templates/env.bat.in
index edf89f04705f3a53fb96b6689cc01b6e7109805a..f6a0886b0a6614ac2da4d7103292b133e1494a42 100644 (file)
--- a/src/WOKTclLib/templates/env.bat.in
+++ b/src/WOKTclLib/templates/env.bat.in
@@ -24,6 +24,7 @@ set  MMGT_CLEAR=1
 set  CSF_EXCEPTION_PROMPT=1
 set "CSF_SHMessage=@RESOURCE_DIR_PREFIX@\SHMessage"
 set "CSF_MDTVTexturesDirectory=@RESOURCE_DIR_PREFIX@\Textures"
+set "CSF_ShadersDirectory=@RESOURCE_DIR_PREFIX@\Shaders"
 set "CSF_XSMessage=@RESOURCE_DIR_PREFIX@\XSMessage"
 set "CSF_TObjMessage=@RESOURCE_DIR_PREFIX@\TObj"
 set "CSF_StandardDefaults=@RESOURCE_DIR_PREFIX@\StdResource"

diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index 8637089b109c4127357da336bbc5ccb96065e6a0..3a28c457df8c8c3d7ed3ec3f06c00a6dd26ccaa0 100755 (executable)
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -158,6 +158,7 @@ export MMGT_CLEAR="1"
 export CSF_EXCEPTION_PROMPT="1"
 export CSF_SHMessage="${CASROOT}/src/SHMessage"
 export CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
+export CSF_ShadersDirectory="${CASROOT}/src/Shaders"
 export CSF_XSMessage="${CASROOT}/src/XSMessage"
 export CSF_TObjMessage="${CASROOT}/src/TObj"
 export CSF_StandardDefaults="${CASROOT}/src/StdResource"

diff --git a/src/WOKTclLib/templates/env.sh.in b/src/WOKTclLib/templates/env.sh.in
index 0e119f0e4c65634dd199f33efb50bed5cde9bb19..8db7672e37cdf3b23a9aafebb02aabc6139eb39e 100644 (file)
--- a/src/WOKTclLib/templates/env.sh.in
+++ b/src/WOKTclLib/templates/env.sh.in
@@ -65,6 +65,7 @@ export MMGT_CLEAR=1
 export CSF_EXCEPTION_PROMPT=1
 export CSF_SHMessage="${aScriptPath}/res/SHMessage"
 export CSF_MDTVTexturesDirectory="${aScriptPath}/res/Textures"
+export CSF_ShadersDirectory="${aScriptPath}/res/Shaders"
 export CSF_XSMessage="SCRIPTROOT/res/XSMessage"
 export CSF_TObjMessage="SCRIPTROOT/res/TObj"
 export CSF_StandardDefaults="${aScriptPath}/res/StdResource"

diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl
index 087580e04830aa4d01dda6f85de05d1425bd99de..6b479aa7ff0d96553a336a695bad56a06a9d3d59 100644 (file)
--- a/src/WOKsite/wok_tclshrc.tcl
+++ b/src/WOKsite/wok_tclshrc.tcl
@@ -453,6 +453,13 @@ proc wenv {} {
   } else {
     puts "Warning! 'Textures'      package not found!"
   }
+  
+  set aShaders [woklocate -u Shaders]
+  if { $aShaders != "" } {
+    set env(CSF_ShadersDirectory) [string range [wokinfo -p source:. [woklocate -u Shaders]] 0 [expr {[string length [wokinfo -p source:. $aShaders]] - 3}]]
+  } else {
+    puts "Warning! 'Shaders'      package not found!"
+  }
 
   set aXSMsg [woklocate -u XSMessage]
   if { $aXSMsg != "" } {