From: dbp <dbp@opencascade.com>
Date: Tue, 8 Oct 2013 12:03:57 +0000 (+0400)
Subject: 0024241: Adding shaders directory to OCCT resources
X-Git-Tag: V6_7_1~26
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=b49a479548ee8370484cf7d99217807d100907b7;p=occt-wok.git

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 69b92f1..77c4b1f 100644
--- 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 edf89f0..f6a0886 100644
--- 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 8637089..3a28c45 100755
--- 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 0e119f0..8db7672 100644
--- 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 087580e..6b479aa 100644
--- 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 != "" } {