From a6ade165340fc508d3616c9c7243c8af30df02af Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 26 Mar 2013 11:27:03 +0000 Subject: [PATCH] vslol: add HLSL types to the Lol Engine types and update version. --- tools/vslol/CppKeywordClassifier.cs | 4 +- tools/vslol/Properties/AssemblyInfo.cs | 4 +- tools/vslol/VsLol.csproj | 342 +++++++++++----------- tools/vslol/source.extension.vsixmanifest | 2 +- 4 files changed, 177 insertions(+), 175 deletions(-) diff --git a/tools/vslol/CppKeywordClassifier.cs b/tools/vslol/CppKeywordClassifier.cs index 9c06b2b8..b7d47383 100644 --- a/tools/vslol/CppKeywordClassifier.cs +++ b/tools/vslol/CppKeywordClassifier.cs @@ -53,7 +53,6 @@ internal class LolClassifierProvider : IClassifierProvider if (m_inprogress) return null; - /* Try to guess whether this is a Lol Engine project */ #if FALSE if (m_textdoc_factory != null) { @@ -62,6 +61,8 @@ internal class LolClassifierProvider : IClassifierProvider /* print doc.FilePath */ } #endif + + /* Try to guess whether this is a Lol Engine project */ EnvDTE.DTE dte = m_sp.GetService(typeof(EnvDTE.DTE)) as EnvDTE.DTE; bool islolengine = false; if (dte.Solution.FullName.Contains("Lol.sln")) @@ -107,6 +108,7 @@ class CppKeywordClassifier : IClassifier private static string[] m_lol_types = { "ldouble|real|half", + "(float|int)([234]|2x2|3x3|4x4)", "(f(16|128)||d|[ui](8|16||64)|r)(vec[234]|mat[234]|quat|cmplx)", }; diff --git a/tools/vslol/Properties/AssemblyInfo.cs b/tools/vslol/Properties/AssemblyInfo.cs index 0d0baffd..ef04a80c 100644 --- a/tools/vslol/Properties/AssemblyInfo.cs +++ b/tools/vslol/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("58968f91-edb8-4a4c-9f4f-ba39fdb4a21a")] -[assembly: AssemblyVersion("1.0.0.8")] -[assembly: AssemblyFileVersion("1.0.0.8")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/tools/vslol/VsLol.csproj b/tools/vslol/VsLol.csproj index fcdfd933..08960829 100644 --- a/tools/vslol/VsLol.csproj +++ b/tools/vslol/VsLol.csproj @@ -1,171 +1,171 @@ - - - - Debug - AnyCPU - 2.0 - {58922993-9830-4A40-B462-0326342F69ED} - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - lol - Lol.VisualStudio.VsLol - v4.0 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - AllRules.ruleset - - - - True - ..\..\..\..\Program Files (x86)\Common Files\Microsoft Shared\MSEnv\PublicAssemblies\envdte.dll - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - True - True - VsLol.resx - - - - - - - 1000 - Designer - - - - - ResXFileCodeGenerator - VsLol.Designer.cs - Designer - true - - - - - Always - true - - - Designer - - - - - False - Microsoft .NET Framework 4 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Microsoft Visual Basic PowerPacks 10.0 - true - - - False - Windows Installer 3.1 - true - - - - - - - - true - true - - - - - + + + + Debug + AnyCPU + 2.0 + {58922993-9830-4A40-B462-0326342F69ED} + {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Library + Properties + lol + Lol.VisualStudio.VsLol + v4.0 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.1.0 + false + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + true + AllRules.ruleset + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + true + AllRules.ruleset + + + + True + ..\..\..\..\Program Files (x86)\Common Files\Microsoft Shared\MSEnv\PublicAssemblies\envdte.dll + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + True + True + VsLol.resx + + + + + + + 1000 + Designer + + + + + ResXFileCodeGenerator + VsLol.Designer.cs + Designer + true + + + + + Always + true + + + Designer + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Microsoft Visual Basic PowerPacks 10.0 + true + + + False + Windows Installer 3.1 + true + + + + + + + + true + true + + + + + diff --git a/tools/vslol/source.extension.vsixmanifest b/tools/vslol/source.extension.vsixmanifest index 4c3d6bb0..26f8c9b9 100644 --- a/tools/vslol/source.extension.vsixmanifest +++ b/tools/vslol/source.extension.vsixmanifest @@ -3,7 +3,7 @@ VsLol Lol - 1.0.0.8 + 1.0.1.0 Lol Engine Productivity Tools. 1033 http://lolengine.net/