Merge pull request #4 from dnblank123/valheim

header guards and refactor
dnblank123 · Jun 10, 2024 · 387c0d1 · 387c0d1
2 parents a5d01e5 + 883bceb
commit 387c0d1
Show file tree

Hide file tree

Showing 16 changed files with 179 additions and 82 deletions.
diff --git a/Shaderbool.h b/Shaderbool.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef BOOL_H
+#define BOOL_H
 
 bool RadialBlurB = false;
 bool GrassB = false;
@@ -16,3 +17,5 @@ bool VSPlayerB = false;
 bool PlayerHairB = false;
 bool PlayerFaceB = false;
 bool PlayerBodyB = false;
+
+#endif
diff --git a/Shaders/Default.h b/Shaders/Default.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef DEFAULT_H
+#define DEFAULT_H
 
-inline constexpr uint8_t SIMPLIFIED_VS_DEFAULT_SHADER[2952] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 2952> SIMPLIFIED_VS_DEFAULT_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x6E, 0x39, 0xD8, 0x49, 0x57, 0xFD, 0x9D, 0x5B, 0xBA, 0x5D, 0xF4, 0xB4,
     0x41, 0xB7, 0xD8, 0xE6, 0x01, 0x00, 0x00, 0x00, 0x88, 0x0B, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -188,7 +192,7 @@ inline constexpr uint8_t SIMPLIFIED_VS_DEFAULT_SHADER[2952] = {
     0x09, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_DEFAULT_SHADER [2580] = {
+inline constexpr std::array<uint8_t, 2580> SIMPLIFIED_FS_DEFAULT_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x74, 0x3B, 0x64, 0x94, 0xD2, 0x0F, 0x69, 0xC0, 0x58, 0xAA, 0x97, 0xF1,
     0x02, 0x90, 0x05, 0xA2, 0x01, 0x00, 0x00, 0x00, 0x14, 0x0A, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x88, 0x01, 0x00, 0x00, 0xD4, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -351,4 +355,6 @@ inline constexpr uint8_t SIMPLIFIED_FS_DEFAULT_SHADER [2580] = {
     0x36, 0x00, 0x00, 0x08, 0xE2, 0x20, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Grass.h b/Shaders/Grass.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef GRASS_H
+#define GRASS_H
 
-inline constexpr uint8_t SIMPLIFIED_VS_GRASS_SHADER[2372] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 2372> SIMPLIFIED_VS_GRASS_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x22, 0x0C, 0x84, 0x2C, 0x85, 0x15, 0x4F, 0x10, 0x6A, 0x9E, 0xDA, 0x70,
     0x8A, 0x64, 0xD0, 0x62, 0x01, 0x00, 0x00, 0x00, 0x44, 0x09, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x34, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -152,7 +156,7 @@ inline constexpr uint8_t SIMPLIFIED_VS_GRASS_SHADER[2372] = {
     0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_GRASS_SHADER[4196] = {
+inline constexpr std::array<uint8_t, 4196> SIMPLIFIED_FS_GRASS_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x01, 0x0F, 0x21, 0x57, 0x6E, 0xFA, 0x66, 0xE6, 0xE3, 0x42, 0x16, 0x93,
     0x08, 0x65, 0x11, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x64, 0x10, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x60, 0x01, 0x00, 0x00, 0xAC, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -416,4 +420,6 @@ inline constexpr uint8_t SIMPLIFIED_FS_GRASS_SHADER[4196] = {
     0x36, 0x00, 0x00, 0x08, 0xE2, 0x20, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Particle1.h b/Shaders/Particle1.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef PARTICLE_H
+#define PARTICLE_H
 
-inline constexpr uint8_t FIXED_PARTICLE_SHADER1[4020] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 4020> FIXED_PARTICLE_SHADER1 = {
 	0x44, 0x58, 0x42, 0x43, 0x0E, 0x1A, 0x71, 0x95, 0x90, 0xD1, 0x23, 0x71, 0xC4, 0x06, 0x71, 0xA8,
 	0x0E, 0xE2, 0xD7, 0x58, 0x01, 0x00, 0x00, 0x00, 0xB4, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
 	0x2C, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xA8, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -255,9 +259,8 @@ inline constexpr uint8_t FIXED_PARTICLE_SHADER1[4020] = {
 	0x3E, 0x00, 0x00, 0x01,
 };
 
-
 //particle 2
-inline constexpr uint8_t FIXED_PARTICLE_SHADER2[5856] = {
+inline constexpr std::array<uint8_t, 5856> FIXED_PARTICLE_SHADER2 = {
     0x44, 0x58, 0x42, 0x43, 0x88, 0x85, 0xAC, 0xD6, 0xE0, 0xFB, 0x00, 0x83, 0xC7, 0x68, 0x74, 0x56,
     0x24, 0xDB, 0x97, 0x8F, 0x01, 0x00, 0x00, 0x00, 0xE0, 0x16, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xA8, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -624,4 +627,6 @@ inline constexpr uint8_t FIXED_PARTICLE_SHADER2[5856] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x08,
     0x72, 0x20, 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif 
diff --git a/Shaders/Player.h b/Shaders/Player.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef PLAYER_H
+#define PLAYER_H
 
-inline constexpr uint8_t SIMPLIFIED_VS_PLAYER_SHADER[3392] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 3392> SIMPLIFIED_VS_PLAYER_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x38, 0x88, 0x35, 0xD6, 0xB0, 0xBE, 0xA7, 0xCC, 0x5B, 0x98, 0x03, 0xE7,
     0x56, 0xF5, 0x20, 0x8F, 0x01, 0x00, 0x00, 0x00, 0x40, 0x0D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, 0xF4, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -215,7 +219,7 @@ inline constexpr uint8_t SIMPLIFIED_VS_PLAYER_SHADER[3392] = {
     0x06, 0x00, 0x00, 0x00, 0x1A, 0x10, 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_HAIR_PLAYER_SHADER[2880] = {
+inline constexpr std::array<uint8_t, 2880> SIMPLIFIED_FS_HAIR_PLAYER_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x57, 0x13, 0x40, 0x3D, 0x47, 0xB1, 0x4A, 0xD0, 0x9E, 0x48, 0x74, 0x0D,
     0x04, 0x2A, 0xE1, 0x6C, 0x01, 0x00, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -398,7 +402,7 @@ inline constexpr uint8_t SIMPLIFIED_FS_HAIR_PLAYER_SHADER[2880] = {
     0x03, 0x00, 0x00, 0x00, 0x46, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_FACE_PLAYER_SHADER[3492] = {
+inline constexpr std::array<uint8_t, 3492> SIMPLIFIED_FS_FACE_PLAYER_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x44, 0xDE, 0xFF, 0xDC, 0x25, 0xC4, 0x2C, 0x1B, 0x8F, 0x4B, 0x7B, 0x30,
     0x29, 0xDF, 0x4F, 0x16, 0x01, 0x00, 0x00, 0x00, 0xA4, 0x0D, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -620,7 +624,7 @@ inline constexpr uint8_t SIMPLIFIED_FS_FACE_PLAYER_SHADER[3492] = {
     0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_COSTUME_PLAYER_SHADER[2672] = {
+inline constexpr std::array<uint8_t, 2672> SIMPLIFIED_FS_COSTUME_PLAYER_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x88, 0xDF, 0xBE, 0xC3, 0x9B, 0x73, 0xDE, 0xB0, 0x6B, 0x23, 0xCA, 0x40,
     0x78, 0x3D, 0x94, 0xCC, 0x01, 0x00, 0x00, 0x00, 0x70, 0x0A, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x00, 0x00, 0x44, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -788,4 +792,6 @@ inline constexpr uint8_t SIMPLIFIED_FS_COSTUME_PLAYER_SHADER[2672] = {
     0xC3, 0xF5, 0x68, 0x3F, 0xC3, 0xF5, 0x68, 0x3F, 0x00, 0x00, 0x80, 0x3F, 0x36, 0x00, 0x00, 0x08,
     0xF2, 0x20, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/RadialBlur.h b/Shaders/RadialBlur.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef RADIALBLUR_H
+#define RADIALBLUR_H
 
-inline constexpr uint8_t NO_RADIALBLUR_SHADER[532] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 532> NO_RADIALBLUR_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x13, 0x55, 0x0C, 0x67, 0xFB, 0xEC, 0xF9, 0xD8, 0x76, 0xFE, 0xAC, 0xF8,
     0x6B, 0xA5, 0xA6, 0xCF, 0x01, 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -35,4 +39,6 @@ inline constexpr uint8_t NO_RADIALBLUR_SHADER[532] = {
     0x00, 0x00, 0x00, 0x00, 0x46, 0x02, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00,
     0x00, 0x00, 0x80, 0x3D, 0x00, 0x00, 0x80, 0x3D, 0x00, 0x00, 0x80, 0x3D, 0x00, 0x00, 0x00, 0x00,
     0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Shadow.h b/Shaders/Shadow.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef SHADOW_H
+#define SHADOW_H
 
-inline constexpr uint8_t FIXED_PLAYER_SHADOW_SHADER[4276] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 4276> FIXED_PLAYER_SHADOW_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xB6, 0xFA, 0x08, 0x6C, 0x7B, 0x85, 0xD5, 0x02, 0x6D, 0x99, 0x2B, 0x56,
     0x7B, 0x02, 0xF2, 0x26, 0x01, 0x00, 0x00, 0x00, 0xB4, 0x10, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x58, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -271,7 +275,7 @@ inline constexpr uint8_t FIXED_PLAYER_SHADOW_SHADER[4276] = {
     0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t FIXED_PROP_SHADOW_SHADER[996] = {
+inline constexpr std::array<uint8_t, 996> FIXED_PROP_SHADOW_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x27, 0x8F, 0x31, 0xC4, 0x2B, 0xE1, 0x20, 0x90, 0x4E, 0x53, 0x38, 0x8F,
     0xD9, 0x48, 0xD1, 0x98, 0x01, 0x00, 0x00, 0x00, 0xE4, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x58, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -337,7 +341,7 @@ inline constexpr uint8_t FIXED_PROP_SHADOW_SHADER[996] = {
     0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_SHADOW_SHADER[448] = {
+inline constexpr std::array<uint8_t, 448> SIMPLIFIED_FS_SHADOW_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xCE, 0x28, 0x49, 0x69, 0x6D, 0x26, 0x16, 0x68, 0x2F, 0x81, 0x18, 0x18,
     0x2C, 0x7C, 0x0C, 0xD9, 0x01, 0x00, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -366,4 +370,6 @@ inline constexpr uint8_t SIMPLIFIED_FS_SHADOW_SHADER[448] = {
     0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x05, 0x72, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
     0xA6, 0x1A, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x05, 0x82, 0x20, 0x10, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3F, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Spherical.h b/Shaders/Spherical.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef SPHERICAL_H
+#define SPHERICAL_H
 
-inline constexpr uint8_t SIMPLIFIED_FS_LOW_SPHERICAL_SHADER[2416] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 2416> SIMPLIFIED_FS_LOW_SPHERICAL_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xE9, 0x6D, 0x0C, 0x9D, 0x6B, 0x49, 0xC5, 0x89, 0x2F, 0x15, 0xA0, 0x63,
     0x9B, 0x5E, 0x8D, 0x06, 0x01, 0x00, 0x00, 0x00, 0x70, 0x09, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xA0, 0x01, 0x00, 0x00, 0xEC, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -154,7 +158,7 @@ inline constexpr uint8_t SIMPLIFIED_FS_LOW_SPHERICAL_SHADER[2416] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t SIMPLIFIED_FS_HIGH_SPHERICAL_SHADER[7296] = {
+inline constexpr std::array<uint8_t, 7296> SIMPLIFIED_FS_HIGH_SPHERICAL_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x4D, 0xA0, 0xD3, 0x2C, 0x30, 0x22, 0x6A, 0x6A, 0x31, 0x14, 0xEF, 0xCE,
     0x26, 0xB5, 0x86, 0xA5, 0x01, 0x00, 0x00, 0x00, 0x80, 0x1C, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xA0, 0x01, 0x00, 0x00, 0xEC, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -611,4 +615,6 @@ inline constexpr uint8_t SIMPLIFIED_FS_HIGH_SPHERICAL_SHADER[7296] = {
     0x01, 0x00, 0x00, 0x00, 0x0A, 0x10, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x08,
     0xE2, 0x20, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Terrain.h b/Shaders/Terrain.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef TERRAIN_H
+#define TERRAIN_H
 
-inline constexpr uint8_t LOW_VS_TERRAIN_SHADER[2056] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 2056> LOW_VS_TERRAIN_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xBB, 0x6A, 0xC5, 0x7D, 0x0A, 0xC4, 0xBC, 0x8C, 0xD6, 0xBA, 0x1B, 0xD2,
     0x2D, 0x0A, 0x14, 0xFD, 0x01, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0xDC, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -132,7 +136,7 @@ inline constexpr uint8_t LOW_VS_TERRAIN_SHADER[2056] = {
     0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
 };
 
-inline constexpr uint8_t LOW_FS_TERRAIN_SHADER[2104] = {
+inline constexpr std::array<uint8_t, 2104> LOW_FS_TERRAIN_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xCF, 0x4A, 0xF9, 0x74, 0xFA, 0xF2, 0x95, 0x4E, 0xAC, 0x0E, 0x8D, 0xFB,
     0xDA, 0x6E, 0x4E, 0xFB, 0x01, 0x00, 0x00, 0x00, 0x38, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x1C, 0x02, 0x00, 0x00, 0x68, 0x02, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -265,4 +269,6 @@ inline constexpr uint8_t LOW_FS_TERRAIN_SHADER[2104] = {
     0x46, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x02, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x36, 0x00, 0x00, 0x05, 0x12, 0x20, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x10, 0x10, 0x00,
     0x05, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/Shaders/Tex.h b/Shaders/Tex.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef TEX_H
+#define TEX_H
 
-inline constexpr uint8_t SIMPLIFIED_TEX_SHADER[1220] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 1220> SIMPLIFIED_TEX_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0x37, 0x15, 0x39, 0x53, 0x70, 0x97, 0x89, 0xD6, 0xC3, 0x1E, 0x13, 0xC7, 
     0x83, 0x47, 0xA6, 0x6F, 0x01, 0x00, 0x00, 0x00, 0xC4, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
     0x2C, 0x00, 0x00, 0x00, 0x88, 0x01, 0x00, 0x00, 0xBC, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E, 
@@ -78,4 +82,6 @@ inline constexpr uint8_t SIMPLIFIED_TEX_SHADER[1220] = {
     0x00, 0x00, 0x00, 0x00, 0x46, 0x02, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x05, 
     0x82, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x3E, 0x00, 0x00, 0x01, 
-};
+};
+
+#endif
diff --git a/Shaders/VolumeFog.h b/Shaders/VolumeFog.h
@@ -1,6 +1,10 @@
-#pragma once
+#ifndef VOLUMEFOG_H
+#define VOLUMEFOG_H
 
-inline constexpr uint8_t NO_VOLUMEFOG_SHADER[476] = {
+#include <array>
+#include <cstdint>
+
+inline constexpr std::array<uint8_t, 476> NO_VOLUMEFOG_SHADER = {
     0x44, 0x58, 0x42, 0x43, 0xAB, 0x19, 0xB4, 0x40, 0xE6, 0x39, 0xBC, 0x1C, 0x84, 0x7F, 0x60, 0x9C,
     0xA0, 0xAA, 0x31, 0x38, 0x01, 0x00, 0x00, 0x00, 0xDC, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x2C, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x49, 0x53, 0x47, 0x4E,
@@ -31,4 +35,6 @@ inline constexpr uint8_t NO_VOLUMEFOG_SHADER[476] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x08, 0x72, 0x20, 0x10, 0x00,
     0x03, 0x00, 0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x01,
-};
+};
+
+#endif
diff --git a/atelier-sync-fix.vcxproj b/atelier-sync-fix.vcxproj
@@ -62,12 +62,24 @@
   <PropertyGroup>
     <TargetName>d3d11</TargetName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLowSettings|x64'">
+    <ClangTidyChecks>*,-abseil-*,-altera-*,-android-*,-fuchsia-*,-google-*,-llvm*,-modernize-use-trailing-return-type,-zircon-*,-readability-else-after-return,-readability-static-accessed-through-instance,-readability-avoid-const-params-in-decls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-clang-diagnostic-c++98-compat,-clang-diagnostic-unknown-pragmas</ClangTidyChecks>
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+    <ClangTidyChecks>*,-abseil-*,-altera-*,-android-*,-fuchsia-*,-google-*,-llvm*,-modernize-use-trailing-return-type,-zircon-*,-readability-else-after-return,-readability-static-accessed-through-instance,-readability-avoid-const-params-in-decls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-clang-diagnostic-c++98-compat,-clang-diagnostic-unknown-pragmas</ClangTidyChecks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+    <ClangTidyChecks>*,-abseil-*,-altera-*,-android-*,-fuchsia-*,-google-*,-llvm*,-modernize-use-trailing-return-type,-zircon-*,-readability-else-after-return,-readability-static-accessed-through-instance,-readability-avoid-const-params-in-decls,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-clang-diagnostic-c++98-compat,-clang-diagnostic-unknown-pragmas</ClangTidyChecks>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0xa00;NOMINMAX;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>