Fix

VLiance · Sep 20, 2020 · 9ce671a · 9ce671a
1 parent f29073e
commit 9ce671a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/Utils/npp/config.xml b/Utils/npp/config.xml
@@ -9,16 +9,13 @@
         <Replace name="" />
     </FindHistory>
     <History nbMaxFile="10" inSubMenu="no" customLength="-1">
-        <File filename="E:\_Project\_Cwc\Utils\npp\plugins\Config\nppPluginList.dll" />
-        <File filename="E:\_Project\Vellum\Sokol\sokol-samples\libs\fontstash\fontstash.h" />
-        <File filename="E:\_Project\_Cwc\Utils\npp\plugins\Config\NppCCompletionPlugin.ini" />
-        <File filename="E:\_Project\_Cwc\Utils\npp\contextMenu.xml" />
         <File filename="E:\_Project\Vellum\Sokol\sokol-samples\sapp\modplay-sapp.c" />
         <File filename="E:\_Project\Vellum\Sokol\sokol-samples\sapp\cube-sapp.c" />
-        <File filename="E:\_Project\Vellum\Sokol\sokol-samples\sapp\sdf-sapp.glsl" />
         <File filename="E:\_Project\Vellum\Sokol\sokol-samples\sapp\debugtext-sapp.c" />
         <File filename="C:\Windows\System32\drivers\etc\hosts" />
         <File filename="E:\_Project\Vellum\Sokol\sokol-samples\sapp\texcube-sapp.c" />
+        <File filename="E:\_Project\_Cwc\Utils\npp\plugins\Config\NppFavorites.ini" />
+        <File filename="E:\_Project\Vellum\Sokol\sokol\sokol_gfx.h" />
     </History>
     <GUIConfigs>
         <GUIConfig name="ToolBar" visible="yes">standard</GUIConfig>
@@ -27,7 +24,7 @@
         <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
         <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
         <GUIConfig name="TabSetting" replaceBySpace="no" size="4" />
-        <GUIConfig name="AppPosition" x="394" y="162" width="1100" height="700" isMaximized="yes" />
+        <GUIConfig name="AppPosition" x="-1401" y="175" width="1100" height="700" isMaximized="yes" />
         <GUIConfig name="FindWindowPosition" left="-1134" top="371" right="-545" bottom="735" />
         <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">yes</GUIConfig>
         <GUIConfig name="Auto-detection">auto</GUIConfig>
@@ -63,25 +60,27 @@
         <GUIConfig name="SmartHighLight" matchCase="no" wholeWordOnly="yes" useFindSettings="no" onAnotherView="no">yes</GUIConfig>
         <GUIConfig name="ScintillaPrimaryView" lineNumberMargin="show" bookMarkMargin="show" indentGuideLine="show" folderMarkStyle="box" lineWrapMethod="aligned" currentLineHilitingShow="show" scrollBeyondLastLine="no" disableAdvancedScrolling="no" wrapSymbolShow="hide" Wrap="no" borderEdge="yes" isEdgeBgMode="no" edgeMultiColumnPos="" zoom="0" zoom2="0" whiteSpaceShow="hide" eolShow="hide" borderWidth="2" smoothFont="yes" />
         <GUIConfig name="DockingManager" leftWidth="316" rightWidth="346" topHeight="200" bottomHeight="333">
-            <FloatingWindow cont="4" x="1030" y="260" width="1285" height="641" />
+            <FloatingWindow cont="4" x="1668" y="595" width="1887" height="1151" />
+            <FloatingWindow cont="4" x="1668" y="595" width="1887" height="1151" />
             <PluginDlg pluginName="Notepad++::InternalFunction" id="44085" curr="0" prev="-1" isVisible="yes" />
-            <PluginDlg pluginName="Notepad++::InternalFunction" id="44084" curr="1" prev="-1" isVisible="yes" />
+            <PluginDlg pluginName="Notepad++::InternalFunction" id="44080" curr="1" prev="-1" isVisible="yes" />
+            <PluginDlg pluginName="Notepad++::InternalFunction" id="44084" curr="1" prev="4" isVisible="yes" />
             <PluginDlg pluginName="dbgpPlugin.dll" id="0" curr="3" prev="-1" isVisible="no" />
-            <PluginDlg pluginName="Notepad++::InternalFunction" id="44080" curr="1" prev="-1" isVisible="no" />
             <PluginDlg pluginName="BookmarksDook.dll" id="0" curr="4" prev="3" isVisible="yes" />
             <PluginDlg pluginName="Notepad++::InternalFunction" id="0" curr="3" prev="-1" isVisible="yes" />
             <ActiveTabs cont="0" activeTab="0" />
-            <ActiveTabs cont="1" activeTab="0" />
+            <ActiveTabs cont="1" activeTab="1" />
             <ActiveTabs cont="2" activeTab="-1" />
             <ActiveTabs cont="3" activeTab="-1" />
+            <ActiveTabs cont="4" activeTab="-1" />
         </GUIConfig>
     </GUIConfigs>
     <ProjectPanels>
         <ProjectPanel id="0" workSpaceFile="" />
         <ProjectPanel id="1" workSpaceFile="" />
         <ProjectPanel id="2" workSpaceFile="" />
     </ProjectPanels>
-    <FileBrowser latestSelectedItem="E:/_Project/Vellum/Sokol/sokol-samples/sapp/\offscreen-sapp.glsl">
+    <FileBrowser latestSelectedItem="E:/_Project/Vellum/Sokol/sokol-samples/sapp/\pixelformats-sapp.glsl">
         <root foldername="E:/_Project/Vellum/Sokol/_cwc/sapp/" />
         <root foldername="E:/_Project/Vellum/Sokol/sokol-samples/sapp/" />
         <root foldername="E:/_Project/Vellum/Sokol/sokol-samples/libs/" />

diff --git a/Utils/npp/functionList.xml b/Utils/npp/functionList.xml
@@ -72,7 +72,8 @@
 			<!--         V                                                                -->
 			<association id=         "php_syntax"     langID= "1"                          />
 			<association id=           "c_function"   langID= "2"          />
-			<association id=   "cplusplus_syntax"     userDefinedLangName="CWayv"                          />
+			<association id=   "cplusplus_syntax"     userDefinedLangName="CWayv"          />
+			<association id=   "cplusplus_syntax"     ext=".glsl"                          />
 			<association id=      "csharp_class"      langID= "4"                          />
 			<association id=        "java_syntax"     langID= "6"                          />
 			<association id=         "xml_node"       langID= "9"                          />

diff --git a/Utils/npp/userDefineLang.xml b/Utils/npp/userDefineLang.xml
@@ -1,5 +1,5 @@
 <NotepadPlus>
-    <UserLang name="CWayv" ext="cw c cpp cc h" udlVersion="2.1">
+    <UserLang name="CWayv" ext="cw c cpp cc h glsl" udlVersion="2.1">
         <Settings>
             <Global caseIgnored="no" allowFoldOfComments="yes" foldCompact="no" forcePureLC="0" decimalSeparator="0" />
             <Prefix Keywords1="no" Keywords2="yes" Keywords3="yes" Keywords4="no" Keywords5="yes" Keywords6="yes" Keywords7="yes" Keywords8="yes" />
@@ -18,20 +18,20 @@
             <Keywords name="Folders in code1, open">{</Keywords>
             <Keywords name="Folders in code1, middle"></Keywords>
             <Keywords name="Folders in code1, close">}</Keywords>
-            <Keywords name="Folders in code2, open">#if #ifdef cpp #ifndef cpp_class cpp_class_h cpp_h cpp_namespace cpp_namespace_h glsl</Keywords>
+            <Keywords name="Folders in code2, open">#if #ifdef cpp #ifndef cpp_class cpp_class_h cpp_h cpp_namespace cpp_namespace_h glsl @vs @fs</Keywords>
             <Keywords name="Folders in code2, middle">#else #elif</Keywords>
-            <Keywords name="Folders in code2, close">#endif /cpp /cpp_class /cpp_class_h /cpp_h /cpp_namespace /cpp_namespace_h /glsl</Keywords>
+            <Keywords name="Folders in code2, close">#endif /cpp /cpp_class /cpp_class_h /cpp_h /cpp_namespace /cpp_namespace_h  /glsl @end @end</Keywords>
             <Keywords name="Folders in comment, open"></Keywords>
             <Keywords name="Folders in comment, middle"></Keywords>
             <Keywords name="Folders in comment, close"></Keywords>
-            <Keywords name="Keywords1">package private public protected extension continue do else for foreach goto if new NULL var import include function return GzExport&#x000D;&#x000A;forEach in class struct else static extends cpp_override override New get Get set Set this overclass overplace pure namespace extern inline virtual sizeof union template delete operator const static_cast const_cast use enum destructor overable null while using evar case break switch</Keywords>
+            <Keywords name="Keywords1">package private public protected extension continue do else for foreach goto if new NULL var import include function return GzExport&#x000D;&#x000A;forEach in class struct else static extends cpp_override override New get Get set Set this overclass overplace pure namespace extern inline virtual sizeof union template delete operator const static_cast const_cast use enum destructor overable null while using evar case break switch&#x000D;&#x000A;uniform out</Keywords>
             <Keywords name="Keywords2">eA eB eC eD eE eF eG eH eI eJ eK eL eM eN eO eP eQ eR eS eT eU eV eW eX eY eZ&#x000D;&#x000A;hA hB hC hD hE hF hG hH hI hJ hK hL hM hN hO hP hQ hR hS hT hU hV hW hX hY hZ&#x000D;&#x000A;_hA _hB _hC _hD _hE _hF _hG _hH _hI _hJ _hK _hL _hM _hN _hO _hP _hQ _hR _hS _hT _hU _hV _hW _hX _hY _hZ&#x000D;&#x000A;#include #undef #define #pragma #endif defined &#x000D;&#x000A;unsigned bool int long&#x000D;&#x000A;char&#x000D;&#x000A;printf memcpy&#x000D;&#x000A;return&#x000D;&#x000A;thread _parent parent&#x000D;&#x000A;</Keywords>
-            <Keywords name="Keywords3">nA nB nC nD nE nF nG nH nI nJ nK nL nM nN nO nP nQ nR nS nT nU nV nW nX nY nZ&#x000D;&#x000A;_nA _nB _nC _nD _nE _nF _nG _nH _nI _nJ _nK _nL _nM _nN _nO _nP _nQ _nR _nS _nT _nU _nV _nW _nX _nY _nZ&#x000D;&#x000A;dA dB dC dD dE dF dG dH dI dJ dK dL dM dN dO dP dQ dR dS dT dU dV dW dX dY dZ&#x000D;&#x000A;_dA _dB _dC _dD _dE _dF _dG _dH _dI _dJ _dK _dL _dM _dN _dO _dP _dQ _dR _dS _dT _dU _dV _dW _dX _dY _dZ&#x000D;&#x000A;sA sB sC sD sE sF sG sH sI sJ sK sL sM sN sO sP sQ sR sS sT sU sV sW sX sY sZ&#x000D;&#x000A;_sA _sB _sC _sD _sE _sF _sG _sH _sI _sJ _sK _sL _sM _sN _sO _sP _sQ _sR _sS _sT _sU _sV _sW _sX _sY _sZ&#x000D;&#x000A;bA bB bC bD bE bF bG bH bI bJ bK bL bM bN bO bP bQ bR bS bT bU bV bW bX bY bZ&#x000D;&#x000A;_bA _bB _bC _bD _bE _bF _bG _bH _bI _bJ _bK _bL _bM _bN _bO _bP _bQ _bR _bS _bT _bU _bV _bW_bX _bY _bZ</Keywords>
-            <Keywords name="Keywords4">true false QArray QElement Int Array Delegate Void Float String Vec2 Vec3 Vec4 Bool&#x000D;&#x000A;gzFloat gzFloat32 gzFloat64 gzInt gzText8 gzSp gzStr gzStr8 gzStr16 gzStr32 void</Keywords>
+            <Keywords name="Keywords3">&#x000D;&#x000A;nA nB nC nD nE nF nG nH nI nJ nK nL nM nN nO nP nQ nR nS nT nU nV nW nX nY nZ&#x000D;&#x000A;_nA _nB _nC _nD _nE _nF _nG _nH _nI _nJ _nK _nL _nM _nN _nO _nP _nQ _nR _nS _nT _nU _nV _nW _nX _nY _nZ&#x000D;&#x000A;dA dB dC dD dE dF dG dH dI dJ dK dL dM dN dO dP dQ dR dS dT dU dV dW dX dY dZ&#x000D;&#x000A;_dA _dB _dC _dD _dE _dF _dG _dH _dI _dJ _dK _dL _dM _dN _dO _dP _dQ _dR _dS _dT _dU _dV _dW _dX _dY _dZ&#x000D;&#x000A;sA sB sC sD sE sF sG sH sI sJ sK sL sM sN sO sP sQ sR sS sT sU sV sW sX sY sZ&#x000D;&#x000A;_sA _sB _sC _sD _sE _sF _sG _sH _sI _sJ _sK _sL _sM _sN _sO _sP _sQ _sR _sS _sT _sU _sV _sW _sX _sY _sZ&#x000D;&#x000A;bA bB bC bD bE bF bG bH bI bJ bK bL bM bN bO bP bQ bR bS bT bU bV bW bX bY bZ&#x000D;&#x000A;_bA _bB _bC _bD _bE _bF _bG _bH _bI _bJ _bK _bL _bM _bN _bO _bP _bQ _bR _bS _bT _bU _bV _bW_bX _bY _bZ</Keywords>
+            <Keywords name="Keywords4">true false QArray QElement Int Array Delegate Void Float String Vec2 Vec3 Vec4 Bool&#x000D;&#x000A;gzFloat gzFloat32 gzFloat64 gzInt gzText8 gzSp gzStr gzStr8 gzStr16 gzStr32 void&#x000D;&#x000A;vec3&#x000D;&#x000A;float&#x000D;&#x000A;</Keywords>
             <Keywords name="Keywords5">fA fB fC fD fE fF fG fH fI fJ fK fL fM fN fO fP fQ fR fS fT fU fV fW fX fY fZ&#x000D;&#x000A;</Keywords>
-            <Keywords name="Keywords6">oA oB oC oD oE oF oG oH oI oJ oK oL oM oN oO oP oQ oR oS oT oU oV oW oX oY oZ&#x000D;&#x000A;_oA _oB _oC _oD _oE _oF _oG _oH _oI _oJ _oK _oL _oM _oN _oO _oP _oQ _oR _oS _oT _oU _oV _oW _oX _oY _oZ gz GZ_</Keywords>
+            <Keywords name="Keywords6">@ctype&#x000D;&#x000A;oA oB oC oD oE oF oG oH oI oJ oK oL oM oN oO oP oQ oR oS oT oU oV oW oX oY oZ&#x000D;&#x000A;_oA _oB _oC _oD _oE _oF _oG _oH _oI _oJ _oK _oL _oM _oN _oO _oP _oQ _oR _oS _oT _oU _oV _oW _oX _oY _oZ gz GZ_</Keywords>
             <Keywords name="Keywords7">aA aB aC aD aE aF aG aH aI aJ aK aL aM aN aO aP aQ aR aS aT aU aV aW aX aY aZ&#x000D;&#x000A;_aA _aB _aC _aD _aE _aF _aG _aH _aI _aJ _aK _aL _aM _aN _aO _aP _aQ _aR _aS _aT _aU _aV _aW_aX _aY _aZ&#x000D;&#x000A;qA qB qC qD qE qF qG qH qI qJ qK qL qM qN qO qP qQ qR qS qT qU qV qW qX qY qZ&#x000D;&#x000A;_qA _qB _qC _qD _qE _qF _qG _qH _qI _qJ _qK _qL _qM _qN _qO _qP _qQ _qR _qS _qT _qU _qV _qW _qX _qY _qZ&#x000D;&#x000A;qeA qeB qeC qeD qeE qeF qeG qeH qeI qeJ qeK qeL qeM qeN qeO qeP qeQ qeR qeS qeT qeU qeV qeW qeX qeY qeZ&#x000D;&#x000A;_qeA _qeB _qeC _qeD _qeE _qeF _qeG _qeH _qeI _qeJ _qeK _qeL _qeM _qeN _qeO _qeP _qeQ _qeR _qeS _qeT _qeU _qeV _qeW _qeX _qeY _qeZ&#x000D;&#x000A;qaA qaB qaC qaD qaE qaF qaG qaH qaI qaJ qaK qaL qaM qaN qaO qaP qaQ qaR qaS qaT qaU qaV qaW qaX qaY qaZ&#x000D;&#x000A;_qaA _qaB _qaC _qaD _qaE _qaF _qaG _qaH _qaI _qaJ _qaK _qaL _qaM _qaN _qaO _qaP _qaQ _qaR _qaS _qaT _qaU _qaV _qaW _qaX _qaY _qaZ</Keywords>
-            <Keywords name="Keywords8">A B C D E F G H I J K L M N O P Q R S T U V W X Y Z&#x000D;&#x000A;cA cB cC cD cE cF cG cH cI cJ cK cL cM cN cO cP cQ cR cS cT cU cV cW cX cY cZ&#x000D;&#x000A;csA csB csC csD csE csF csG csH csI csJ csK csL csM csN csO csP csQ csR csS csT csU csV csW csX csY csZ</Keywords>
+            <Keywords name="Keywords8">@&#x000D;&#x000A;A B C D E F G H I J K L M N O P Q R S T U V W X Y Z&#x000D;&#x000A;cA cB cC cD cE cF cG cH cI cJ cK cL cM cN cO cP cQ cR cS cT cU cV cW cX cY cZ&#x000D;&#x000A;csA csB csC csD csE csF csG csH csI csJ csK csL csM csN csO csP csQ csR csS csT csU csV csW csX csY csZ</Keywords>
             <Keywords name="Delimiters">00&quot; 01\ 02&quot; 03//! 04 05((EOL)) 06//TODO 06#skipContent 06#Wrapper 07 08((EOL)) 08((EOL)) 08((EOL)) 09 10 11 12&quot; 13\ 14&quot; 15 16 17 18 19 20 21// 22 23((EOL))</Keywords>
         </KeywordLists>
         <Styles>
@@ -185,7 +185,7 @@
             <WordsStyle name="DELIMITERS8" fgColor="A47B02" bgColor="FFFFFF" fontName="" fontStyle="0" nesting="50593107" />
         </Styles>
     </UserLang>
-    <UserLang name="GLSL" ext="glsl" udlVersion="2.1">
+    <UserLang name="GLSL" ext="" udlVersion="2.1">
         <Settings>
             <Global caseIgnored="no" allowFoldOfComments="yes" foldCompact="no" forcePureLC="0" decimalSeparator="0" />
             <Prefix Keywords1="no" Keywords2="no" Keywords3="no" Keywords4="no" Keywords5="no" Keywords6="no" Keywords7="no" Keywords8="yes" />