build updates (#655)

Editor/AnimationWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "AnimationWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/AnimationWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class AnimationWindow : public wi::gui::Window

Editor/ArmatureWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ArmatureWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/ArmatureWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ArmatureWindow : public wi::gui::Window

Editor/CameraComponentWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "CameraComponentWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/CameraComponentWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class CameraComponentWindow : public wi::gui::Window

Editor/CameraWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "CameraWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/CameraWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class CameraWindow : public wi::gui::Window

Editor/ColliderWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ColliderWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/ColliderWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ColliderWindow : public wi::gui::Window

Editor/ComponentsWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ComponentsWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;

Editor/ComponentsWindow.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
 #include "MaterialWindow.h"
 #include "WeatherWindow.h"
 #include "ObjectWindow.h"

Editor/DecalWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "DecalWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/DecalWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class DecalWindow : public wi::gui::Window

Editor/Editor.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "wiRenderer.h"
 #include "wiScene_BindLua.h"
 
@@ -9,11 +8,6 @@
 #include "FontAwesomeV6.h" // font TTF data
 #include "yumin.h" // yumin.ttf font
 
-#include <string>
-#include <cassert>
-#include <cmath>
-#include <limits>
-
 using namespace wi::graphics;
 using namespace wi::primitive;
 using namespace wi::scene;

Editor/Editor.h

@@ -1,11 +1,9 @@
 #pragma once
-#include "WickedEngine.h"
 #include "Translator.h"
 #include "wiScene_BindLua.h"
 #include "OptionsWindow.h"
 #include "ComponentsWindow.h"
 #include "ProfilerWindow.h"
-
 #include "IconDefinitions.h"
 
 class EditorLoadingScreen : public wi::LoadingScreen

Editor/Editor_SOURCE.vcxitems

@@ -182,6 +182,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)Translator.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)WeatherWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)xatlas.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)yumin.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)config.ini">
@@ -250,6 +251,20 @@
     </Image>
   </ItemGroup>
   <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)languages\readme.txt">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Text>
     <Text Include="$(MSBuildThisFileDirectory)terrain\licenses.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\Magyar.xml">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Xml>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\日本語.xml">
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+      <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+    </Xml>
+  </ItemGroup>
 </Project>

Editor/Editor_SOURCE.vcxitems.filters

@@ -138,6 +138,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)HumanoidWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)GeneralWindow.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ProfilerWindow.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)yumin.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)startup.lua" />
@@ -159,6 +160,9 @@
     <Filter Include="terrain">
       <UniqueIdentifier>{9a5b997d-f07e-45c5-849a-717f15cba0ab}</UniqueIdentifier>
     </Filter>
+    <Filter Include="languages">
+      <UniqueIdentifier>{beae58b9-9c06-4b1f-9e03-a27712d6a579}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(MSBuildThisFileDirectory)terrain\base.jpg">
@@ -193,5 +197,16 @@
     <Text Include="$(MSBuildThisFileDirectory)terrain\licenses.txt">
       <Filter>terrain</Filter>
     </Text>
+    <Text Include="$(MSBuildThisFileDirectory)languages\readme.txt">
+      <Filter>languages</Filter>
+    </Text>
+  </ItemGroup>
+  <ItemGroup>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\Magyar.xml">
+      <Filter>languages</Filter>
+    </Xml>
+    <Xml Include="$(MSBuildThisFileDirectory)languages\日本語.xml">
+      <Filter>languages</Filter>
+    </Xml>
   </ItemGroup>
 </Project>

Editor/EmitterWindow.cpp

@@ -1,8 +1,5 @@
 #include "stdafx.h"
 #include "EmitterWindow.h"
-#include "Editor.h"
-
-#include <string>
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/EmitterWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow;

Editor/EnvProbeWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "EnvProbeWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/EnvProbeWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class EnvProbeWindow : public wi::gui::Window

Editor/ExpressionWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ExpressionWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/ExpressionWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ExpressionWindow : public wi::gui::Window

Editor/ForceFieldWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "ForceFieldWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void ForceFieldWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/ForceFieldWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ForceFieldWindow : public wi::gui::Window

Editor/GeneralWindow.cpp

@@ -1,8 +1,5 @@
 #include "stdafx.h"
 #include "GeneralWindow.h"
-#include "Editor.h"
-
-#include <filesystem>
 
 using namespace wi::graphics;
 using namespace wi::ecs;

Editor/GeneralWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class GeneralWindow : public wi::gui::Window

Editor/GraphicsWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "GraphicsWindow.h"
-#include "Editor.h"
 #include "shaders/ShaderInterop_DDGI.h"
 
 using namespace wi::graphics;

Editor/GraphicsWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class GraphicsWindow : public wi::gui::Window

Editor/HairParticleWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "HairParticleWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/HairParticleWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow;

Editor/HierarchyWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "HierarchyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void HierarchyWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/HierarchyWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class HierarchyWindow : public wi::gui::Window

Editor/HumanoidWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "HumanoidWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/HumanoidWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class HumanoidWindow : public wi::gui::Window

Editor/IKWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "IKWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void IKWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/IKWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class IKWindow : public wi::gui::Window

Editor/LayerWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "LayerWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void LayerWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/LayerWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class LayerWindow : public wi::gui::Window

Editor/LightWindow.cpp

@@ -1,14 +1,10 @@
 #include "stdafx.h"
 #include "LightWindow.h"
-#include "Editor.h"
-
-#include <string>
 
 using namespace wi::ecs;
 using namespace wi::graphics;
 using namespace wi::scene;
 
-
 void LightWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/LightWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class LightWindow : public wi::gui::Window

Editor/MaterialPickerWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "MaterialWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;
@@ -18,7 +17,6 @@ void MaterialPickerWindow::Create(EditorComponent* _editor)
 	SetCollapsed(true);
 }
 
-
 void MaterialPickerWindow::RecreateButtons()
 {
 	if (editor == nullptr)

Editor/MaterialPickerWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialPickerWindow : public wi::gui::Window

Editor/MaterialWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "MaterialWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;

Editor/MaterialWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MaterialWindow : public wi::gui::Window

Editor/MeshWindow.cpp

@@ -1,13 +1,10 @@
 #include "stdafx.h"
 #include "MeshWindow.h"
-#include "Editor.h"
 
 #include "Utility/stb_image.h"
 
 #include "meshoptimizer/meshoptimizer.h"
 
-#include <string>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 

Editor/MeshWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class MeshWindow : public wi::gui::Window

Editor/ModelImporter.h

@@ -1,10 +1,4 @@
 #pragma once
-#include <string>
-
-namespace wi::scene
-{
-	struct Scene;
-}
 
 void ImportModel_OBJ(const std::string& fileName, wi::scene::Scene& scene);
 void ImportModel_GLTF(const std::string& fileName, wi::scene::Scene& scene);

Editor/ModelImporter_GLTF.cpp

@@ -5,11 +5,6 @@
 
 #include "Utility/stb_image.h"
 
-#include <mutex>
-#include <string>
-#include <limits>
-#include <fstream>
-
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_FS
 #define TINYGLTF_NO_STB_IMAGE

Editor/ModelImporter_OBJ.cpp

@@ -5,10 +5,6 @@
 #define TINYOBJLOADER_IMPLEMENTATION
 #include "tiny_obj_loader.h"
 
-#include <string>
-#include <istream>
-#include <streambuf>
-
 using namespace wi::graphics;
 using namespace wi::scene;
 using namespace wi::ecs;

Editor/NameWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "NameWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void NameWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/NameWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class NameWindow : public wi::gui::Window

Editor/ObjectWindow.cpp

@@ -1,16 +1,12 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "ObjectWindow.h"
 #include "wiScene.h"
 
 #include "xatlas.h"
 
-#include <string>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 static void SetPixel(uint8_t *dest, int destWidth, int x, int y, const uint8_t *color)
 {
 	uint8_t *pixel = &dest[x * 4 + y * (destWidth * 4)];

Editor/ObjectWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ObjectWindow : public wi::gui::Window

Editor/OptionsWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "OptionsWindow.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;

Editor/OptionsWindow.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
 #include "GraphicsWindow.h"
 #include "CameraWindow.h"
 #include "MaterialPickerWindow.h"

Editor/PaintToolWindow.cpp

@@ -1,10 +1,7 @@
 #include "stdafx.h"
-#include "Editor.h"
 #include "PaintToolWindow.h"
 #include "shaders/ShaderInterop_Renderer.h"
 
-#include <cmath>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 using namespace wi::graphics;

Editor/PaintToolWindow.h

@@ -1,8 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
-#include <deque>
-
 class EditorComponent;
 
 class PaintToolWindow : public wi::gui::Window

Editor/ProfilerWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ProfilerWidget : public wi::gui::Widget

Editor/RigidBodyWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "RigidBodyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/RigidBodyWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class RigidBodyWindow : public wi::gui::Window

Editor/ScriptWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "ScriptWindow.h"
-#include "Editor.h"
 
 void ScriptWindow::Create(EditorComponent* _editor)
 {

Editor/ScriptWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class ScriptWindow : public wi::gui::Window

Editor/SoftBodyWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "SoftBodyWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/SoftBodyWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class SoftBodyWindow : public wi::gui::Window

Editor/SoundWindow.cpp

@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "SoundWindow.h"
 #include "wiAudio.h"
-#include "Editor.h"
 
 using namespace wi::graphics;
 using namespace wi::ecs;

Editor/SoundWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class WaveGraph : public wi::gui::Widget

Editor/SpringWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "SpringWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void SpringWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/SpringWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class SpringWindow : public wi::gui::Window

Editor/TerrainWindow.cpp

@@ -1,11 +1,8 @@
 #include "stdafx.h"
 #include "TerrainWindow.h"
-#include "Editor.h"
 
 #include "Utility/stb_image.h"
 
-#include <unordered_map>
-
 using namespace wi::ecs;
 using namespace wi::scene;
 

Editor/TerrainWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 struct ModifierWindow : public wi::gui::Window

Editor/TransformWindow.cpp

@@ -1,11 +1,9 @@
 #include "stdafx.h"
 #include "TransformWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;
 
-
 void TransformWindow::Create(EditorComponent* _editor)
 {
 	editor = _editor;

Editor/TransformWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class TransformWindow : public wi::gui::Window

Editor/Translator.h

@@ -1,8 +1,4 @@
 #pragma once
-#include "CommonInclude.h"
-#include "wiCanvas.h"
-#include "wiVector.h"
-#include "wiUnorderedSet.h"
 
 class Translator
 {

Editor/WeatherWindow.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "WeatherWindow.h"
-#include "Editor.h"
 
 using namespace wi::ecs;
 using namespace wi::scene;

Editor/WeatherWindow.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 class EditorComponent;
 
 class WeatherWindow : public wi::gui::Window

Editor/main_Windows.cpp

@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "main_Windows.h"
-#include "Editor.h"
 
 #include <fstream>
 #include <thread>

Editor/stdafx.h

@@ -1,2 +1,16 @@
 #pragma once
-#include "WickedEngine.h"
+#include <string>
+#include <cassert>
+#include <cmath>
+#include <deque>
+#include <limits>
+#include <filesystem>
+#include <mutex>
+#include <limits>
+#include <fstream>
+#include <istream>
+#include <streambuf>
+#include <unordered_map>
+
+#include "WickedEngine.h"
+#include "Editor.h"

Tests/Tests.cpp

@@ -1,11 +1,4 @@
 #include "stdafx.h"
-#include "Tests.h"
-
-#include <string>
-#include <fstream>
-#include <thread>
-#include <unordered_map>
-#include <vector>
 
 using namespace wi::ecs;
 using namespace wi::scene;

Tests/Tests.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "WickedEngine.h"
-
 
 class TestsRenderer : public wi::RenderPath3D
 {

Tests/stdafx.h

@@ -1,3 +1,9 @@
 #pragma once
+#include <string>
+#include <fstream>
+#include <thread>
+#include <unordered_map>
+#include <vector>
+
 #include "WickedEngine.h"
 #include "Tests.h"

WickedEngine/CommonInclude.h

@@ -4,8 +4,6 @@
 // This is a helper include file pasted into all engine headers, try to keep it minimal!
 // Do not include engine features in this file!
 
-#include <cstdlib>
-#include <cstring>
 #include <cstdint>
 #include <type_traits>
 

WickedEngine/shaders/ShaderInterop_Renderer.h

@@ -412,6 +412,9 @@ struct ShaderTypeBin
 
 	uint4 padding2[14]; // force 256-byte alignment that's necessary for constant buffers :(
 };
+#ifdef __cplusplus
+static_assert(sizeof(ShaderTypeBin) == 256); // 256 byte forced constant buffer alignment for DX12
+#endif // __cplusplus
 static const uint SHADERTYPE_BIN_COUNT = 10;
 
 struct VisibilityTile

WickedEngine/wiTerrain.cpp

@@ -11,6 +11,9 @@
 #include "wiBacklog.h"
 
 #include <mutex>
+#include <string>
+#include <atomic>
+#include <random>
 
 using namespace wi::ecs;
 using namespace wi::scene;

WickedEngine/wiTerrain.h

@@ -7,9 +7,6 @@
 #include "wiColor.h"
 #include "wiHairParticle.h"
 
-#include <random>
-#include <string>
-#include <atomic>
 #include <memory>
 
 namespace wi::terrain