Fix compilation error in SimplexNoise. Adjust VC++ projects after merge

Author: codereader

libs/noise/SimplexNoise.h

@@ -29,8 +29,8 @@ class SimplexNoise
                                           {0, 1, -1},
                                           {0, -1, -1}};
 
-    static constexpr double F2 = 0.5 * (std::sqrt(3.0) - 1.0);
-    static constexpr double G2 = (3.0 - std::sqrt(3.0)) / 6.0;
+    static constexpr double F2 = 0.5 * (/*std::sqrt(3.0)=*/1.73205080757 - 1.0);
+    static constexpr double G2 = (3.0 - /*std::sqrt(3.0)=*/1.73205080757) / 6.0;
 
     static double dot2(const double g[], double x, double y)
     {

tools/msvc/DarkRadiant.vcxproj

@@ -370,6 +370,7 @@
     <ClCompile Include="..\..\radiant\ui\mainframe\ScreenUpdateBlocker.cpp" />
     <ClCompile Include="..\..\radiant\ui\brush\QuerySidesDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\transform\TransformPanel.cpp" />
+    <ClCompile Include="..\..\radiant\ui\terrain\TerrainGeneratorDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\UserInterfaceModule.cpp" />
     <ClCompile Include="..\..\radiant\xyview\GlobalXYWnd.cpp" />
     <ClCompile Include="..\..\radiant\xyview\OrthoView.cpp" />
@@ -614,6 +615,7 @@
     <ClInclude Include="..\..\radiant\ui\brush\QuerySidesDialog.h" />
     <ClInclude Include="..\..\radiant\ui\transform\TransformPanel.h" />
     <ClInclude Include="..\..\radiant\ui\transform\TransformPanelControl.h" />
+    <ClInclude Include="..\..\radiant\ui\terrain\TerrainGeneratorDialog.h" />
     <ClInclude Include="..\..\radiant\ui\UserInterfaceModule.h" />
     <ClInclude Include="..\..\radiant\xyview\GlobalXYWnd.h" />
     <ClInclude Include="..\..\radiant\xyview\OrthoView.h" />

tools/msvc/DarkRadiant.vcxproj.filters

@@ -203,6 +203,9 @@
     <Filter Include="src\ui\scatter">
       <UniqueIdentifier>{41fb15cf-e351-4f2a-97a8-8278c61c6a75}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\ui\terrain">
+      <UniqueIdentifier>{ba840bd8-ef36-4397-b595-0953f3c805f1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -700,6 +703,9 @@
     <ClCompile Include="..\..\radiant\ui\transform\TransformPanel.cpp">
       <Filter>src\ui\transform</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\terrain\TerrainGeneratorDialog.cpp">
+      <Filter>src\ui\terrain</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\merge\MapMergePanel.cpp">
       <Filter>src\ui\merge</Filter>
     </ClCompile>
@@ -1434,6 +1440,9 @@
     <ClInclude Include="..\..\radiant\ui\transform\TransformPanel.h">
       <Filter>src\ui\transform</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\terrain\TerrainGeneratorDialog.h">
+      <Filter>src\ui\terrain</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\merge\MapMergePanel.h">
       <Filter>src\ui\merge</Filter>
     </ClInclude>

tools/msvc/libs.vcxproj

@@ -208,6 +208,9 @@
     <ClInclude Include="..\..\libs\pivot.h" />
     <ClInclude Include="..\..\libs\RandomOrigin.h" />
     <ClInclude Include="..\..\libs\Rectangle.h" />
+    <ClInclude Include="..\..\libs\noise\Noise.h" />
+    <ClInclude Include="..\..\libs\noise\PerlinNoise.h" />
+    <ClInclude Include="..\..\libs\noise\SimplexNoise.h" />
     <ClInclude Include="..\..\libs\registry\adaptors.h" />
     <ClInclude Include="..\..\libs\registry\buffer.h" />
     <ClInclude Include="..\..\libs\registry\CachedKey.h" />

tools/msvc/libs.vcxproj.filters

@@ -105,6 +105,15 @@
     <ClInclude Include="..\..\libs\string\convert.h">
       <Filter>string</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\noise\SimplexNoise.h">
+      <Filter>noise</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libs\noise\PerlinNoise.h">
+      <Filter>noise</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libs\noise\Noise.h">
+      <Filter>noise</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\libs\util\ScopedBoolLock.h">
       <Filter>util</Filter>
     </ClInclude>
@@ -468,5 +477,8 @@
     <Filter Include="decl">
       <UniqueIdentifier>{b6509c1f-67af-4737-b9d9-833a01c4bdd4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="noise">
+      <UniqueIdentifier>{d4ce22a9-f44f-4484-9b65-e5a593ba35d9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>