diff options
| author | untodesu <kirill@untode.su> | 2025-09-11 15:45:26 +0500 |
|---|---|---|
| committer | untodesu <kirill@untode.su> | 2025-09-11 15:45:26 +0500 |
| commit | b8bbc54c5c920aff1ff1b45a693f50d6d96d61c8 (patch) | |
| tree | 8b2903b313a71f8851705be400fc3e0a8317028f | |
| parent | a6ea7b7bbc66327cc2a957496f65dcfab5361cee (diff) | |
| download | voxelius-b8bbc54c5c920aff1ff1b45a693f50d6d96d61c8.tar.bz2 voxelius-b8bbc54c5c920aff1ff1b45a693f50d6d96d61c8.zip | |
Revise style: split include groups
55 files changed, 209 insertions, 287 deletions
diff --git a/.clang-format b/.clang-format index 499fbac..bcb9014 100644 --- a/.clang-format +++ b/.clang-format @@ -30,9 +30,11 @@ AlignConsecutiveMacros: AlignFunctionPointers: false PadOperators: true AlignEscapedNewlines: Left -AlignOperands: true -PenaltyBreakAssignment: 21 +AlignOperands: false +PenaltyBreakAssignment: 50 PenaltyBreakBeforeFirstCallParameter: 21 +PenaltyBreakOpenParenthesis: 21 +PenaltyIndentedWhitespace: 1 AlignTrailingComments: Kind: Always OverEmptyLines: 0 @@ -90,7 +92,7 @@ DerivePointerAlignment: false EmptyLineBeforeAccessModifier: LogicalBlock FixNamespaceComments: true ShortNamespaceLines: 0 -IndentCaseBlocks: true +IndentCaseBlocks: false IndentCaseLabels: true IndentGotoLabels: true IndentPPDirectives: None @@ -102,7 +104,6 @@ Language: Cpp LineEnding: CRLF MaxEmptyLinesToKeep: 1 NamespaceIndentation: None -PenaltyIndentedWhitespace: 2 PointerAlignment: Left ReflowComments: true SortIncludes: true diff --git a/core/config/number.hh b/core/config/number.hh index ad79770..3455910 100644 --- a/core/config/number.hh +++ b/core/config/number.hh @@ -3,6 +3,7 @@ #pragma once #include "core/config/ivalue.hh" + #include "core/math/concepts.hh" namespace config diff --git a/core/io/config_map.cc b/core/io/config_map.cc index 9fd8ff7..d22913e 100644 --- a/core/io/config_map.cc +++ b/core/io/config_map.cc @@ -3,8 +3,11 @@ #include "core/io/config_map.hh" #include "core/config/ivalue.hh" + #include "core/io/cmdline.hh" + #include "core/utils/string.hh" + #include "core/version.hh" void io::ConfigMap::load_cmdline(void) diff --git a/core/math/crc64.cc b/core/math/crc64.cc index 15b67cb..4311eaf 100644 --- a/core/math/crc64.cc +++ b/core/math/crc64.cc @@ -8,264 +8,49 @@ // - Initial value: `0x0000000000000000` // - Final xor: `0x0000000000000000` // CRC Calculator: https://www.sunshine2k.de/coding/javascript/crc/crc_js.html -constexpr static const std::uint64_t crc_table[256] = { - 0x0000000000000000, - 0x42F0E1EBA9EA3693, - 0x85E1C3D753D46D26, - 0xC711223CFA3E5BB5, - 0x493366450E42ECDF, - 0x0BC387AEA7A8DA4C, - 0xCCD2A5925D9681F9, - 0x8E224479F47CB76A, - 0x9266CC8A1C85D9BE, - 0xD0962D61B56FEF2D, - 0x17870F5D4F51B498, - 0x5577EEB6E6BB820B, - 0xDB55AACF12C73561, - 0x99A54B24BB2D03F2, - 0x5EB4691841135847, - 0x1C4488F3E8F96ED4, - 0x663D78FF90E185EF, - 0x24CD9914390BB37C, - 0xE3DCBB28C335E8C9, - 0xA12C5AC36ADFDE5A, - 0x2F0E1EBA9EA36930, - 0x6DFEFF5137495FA3, - 0xAAEFDD6DCD770416, - 0xE81F3C86649D3285, - 0xF45BB4758C645C51, - 0xB6AB559E258E6AC2, - 0x71BA77A2DFB03177, - 0x334A9649765A07E4, - 0xBD68D2308226B08E, - 0xFF9833DB2BCC861D, - 0x388911E7D1F2DDA8, - 0x7A79F00C7818EB3B, - 0xCC7AF1FF21C30BDE, - 0x8E8A101488293D4D, - 0x499B3228721766F8, - 0x0B6BD3C3DBFD506B, - 0x854997BA2F81E701, - 0xC7B97651866BD192, - 0x00A8546D7C558A27, - 0x4258B586D5BFBCB4, - 0x5E1C3D753D46D260, - 0x1CECDC9E94ACE4F3, - 0xDBFDFEA26E92BF46, - 0x990D1F49C77889D5, - 0x172F5B3033043EBF, - 0x55DFBADB9AEE082C, - 0x92CE98E760D05399, - 0xD03E790CC93A650A, - 0xAA478900B1228E31, - 0xE8B768EB18C8B8A2, - 0x2FA64AD7E2F6E317, - 0x6D56AB3C4B1CD584, - 0xE374EF45BF6062EE, - 0xA1840EAE168A547D, - 0x66952C92ECB40FC8, - 0x2465CD79455E395B, - 0x3821458AADA7578F, - 0x7AD1A461044D611C, - 0xBDC0865DFE733AA9, - 0xFF3067B657990C3A, - 0x711223CFA3E5BB50, - 0x33E2C2240A0F8DC3, - 0xF4F3E018F031D676, - 0xB60301F359DBE0E5, - 0xDA050215EA6C212F, - 0x98F5E3FE438617BC, - 0x5FE4C1C2B9B84C09, - 0x1D14202910527A9A, - 0x93366450E42ECDF0, - 0xD1C685BB4DC4FB63, - 0x16D7A787B7FAA0D6, - 0x5427466C1E109645, - 0x4863CE9FF6E9F891, - 0x0A932F745F03CE02, - 0xCD820D48A53D95B7, - 0x8F72ECA30CD7A324, - 0x0150A8DAF8AB144E, - 0x43A04931514122DD, - 0x84B16B0DAB7F7968, - 0xC6418AE602954FFB, - 0xBC387AEA7A8DA4C0, - 0xFEC89B01D3679253, - 0x39D9B93D2959C9E6, - 0x7B2958D680B3FF75, - 0xF50B1CAF74CF481F, - 0xB7FBFD44DD257E8C, - 0x70EADF78271B2539, - 0x321A3E938EF113AA, - 0x2E5EB66066087D7E, - 0x6CAE578BCFE24BED, - 0xABBF75B735DC1058, - 0xE94F945C9C3626CB, - 0x676DD025684A91A1, - 0x259D31CEC1A0A732, - 0xE28C13F23B9EFC87, - 0xA07CF2199274CA14, - 0x167FF3EACBAF2AF1, - 0x548F120162451C62, - 0x939E303D987B47D7, - 0xD16ED1D631917144, - 0x5F4C95AFC5EDC62E, - 0x1DBC74446C07F0BD, - 0xDAAD56789639AB08, - 0x985DB7933FD39D9B, - 0x84193F60D72AF34F, - 0xC6E9DE8B7EC0C5DC, - 0x01F8FCB784FE9E69, - 0x43081D5C2D14A8FA, - 0xCD2A5925D9681F90, - 0x8FDAB8CE70822903, - 0x48CB9AF28ABC72B6, - 0x0A3B7B1923564425, - 0x70428B155B4EAF1E, - 0x32B26AFEF2A4998D, - 0xF5A348C2089AC238, - 0xB753A929A170F4AB, - 0x3971ED50550C43C1, - 0x7B810CBBFCE67552, - 0xBC902E8706D82EE7, - 0xFE60CF6CAF321874, - 0xE224479F47CB76A0, - 0xA0D4A674EE214033, - 0x67C58448141F1B86, - 0x253565A3BDF52D15, - 0xAB1721DA49899A7F, - 0xE9E7C031E063ACEC, - 0x2EF6E20D1A5DF759, - 0x6C0603E6B3B7C1CA, - 0xF6FAE5C07D3274CD, - 0xB40A042BD4D8425E, - 0x731B26172EE619EB, - 0x31EBC7FC870C2F78, - 0xBFC9838573709812, - 0xFD39626EDA9AAE81, - 0x3A28405220A4F534, - 0x78D8A1B9894EC3A7, - 0x649C294A61B7AD73, - 0x266CC8A1C85D9BE0, - 0xE17DEA9D3263C055, - 0xA38D0B769B89F6C6, - 0x2DAF4F0F6FF541AC, - 0x6F5FAEE4C61F773F, - 0xA84E8CD83C212C8A, - 0xEABE6D3395CB1A19, - 0x90C79D3FEDD3F122, - 0xD2377CD44439C7B1, - 0x15265EE8BE079C04, - 0x57D6BF0317EDAA97, - 0xD9F4FB7AE3911DFD, - 0x9B041A914A7B2B6E, - 0x5C1538ADB04570DB, - 0x1EE5D94619AF4648, - 0x02A151B5F156289C, - 0x4051B05E58BC1E0F, - 0x87409262A28245BA, - 0xC5B073890B687329, - 0x4B9237F0FF14C443, - 0x0962D61B56FEF2D0, - 0xCE73F427ACC0A965, - 0x8C8315CC052A9FF6, - 0x3A80143F5CF17F13, - 0x7870F5D4F51B4980, - 0xBF61D7E80F251235, - 0xFD913603A6CF24A6, - 0x73B3727A52B393CC, - 0x31439391FB59A55F, - 0xF652B1AD0167FEEA, - 0xB4A25046A88DC879, - 0xA8E6D8B54074A6AD, - 0xEA16395EE99E903E, - 0x2D071B6213A0CB8B, - 0x6FF7FA89BA4AFD18, - 0xE1D5BEF04E364A72, - 0xA3255F1BE7DC7CE1, - 0x64347D271DE22754, - 0x26C49CCCB40811C7, - 0x5CBD6CC0CC10FAFC, - 0x1E4D8D2B65FACC6F, - 0xD95CAF179FC497DA, - 0x9BAC4EFC362EA149, - 0x158E0A85C2521623, - 0x577EEB6E6BB820B0, - 0x906FC95291867B05, - 0xD29F28B9386C4D96, - 0xCEDBA04AD0952342, - 0x8C2B41A1797F15D1, - 0x4B3A639D83414E64, - 0x09CA82762AAB78F7, - 0x87E8C60FDED7CF9D, - 0xC51827E4773DF90E, - 0x020905D88D03A2BB, - 0x40F9E43324E99428, - 0x2CFFE7D5975E55E2, - 0x6E0F063E3EB46371, - 0xA91E2402C48A38C4, - 0xEBEEC5E96D600E57, - 0x65CC8190991CB93D, - 0x273C607B30F68FAE, - 0xE02D4247CAC8D41B, - 0xA2DDA3AC6322E288, - 0xBE992B5F8BDB8C5C, - 0xFC69CAB42231BACF, - 0x3B78E888D80FE17A, - 0x7988096371E5D7E9, - 0xF7AA4D1A85996083, - 0xB55AACF12C735610, - 0x724B8ECDD64D0DA5, - 0x30BB6F267FA73B36, - 0x4AC29F2A07BFD00D, - 0x08327EC1AE55E69E, - 0xCF235CFD546BBD2B, - 0x8DD3BD16FD818BB8, - 0x03F1F96F09FD3CD2, - 0x41011884A0170A41, - 0x86103AB85A2951F4, - 0xC4E0DB53F3C36767, - 0xD8A453A01B3A09B3, - 0x9A54B24BB2D03F20, - 0x5D45907748EE6495, - 0x1FB5719CE1045206, - 0x919735E51578E56C, - 0xD367D40EBC92D3FF, - 0x1476F63246AC884A, - 0x568617D9EF46BED9, - 0xE085162AB69D5E3C, - 0xA275F7C11F7768AF, - 0x6564D5FDE549331A, - 0x279434164CA30589, - 0xA9B6706FB8DFB2E3, - 0xEB46918411358470, - 0x2C57B3B8EB0BDFC5, - 0x6EA7525342E1E956, - 0x72E3DAA0AA188782, - 0x30133B4B03F2B111, - 0xF7021977F9CCEAA4, - 0xB5F2F89C5026DC37, - 0x3BD0BCE5A45A6B5D, - 0x79205D0E0DB05DCE, - 0xBE317F32F78E067B, - 0xFCC19ED95E6430E8, - 0x86B86ED5267CDBD3, - 0xC4488F3E8F96ED40, - 0x0359AD0275A8B6F5, - 0x41A94CE9DC428066, - 0xCF8B0890283E370C, - 0x8D7BE97B81D4019F, - 0x4A6ACB477BEA5A2A, - 0x089A2AACD2006CB9, - 0x14DEA25F3AF9026D, - 0x562E43B4931334FE, - 0x913F6188692D6F4B, - 0xD3CF8063C0C759D8, - 0x5DEDC41A34BBEEB2, - 0x1F1D25F19D51D821, - 0xD80C07CD676F8394, - 0x9AFCE626CE85B507, -}; +constexpr static const std::uint64_t crc_table[256] = { 0x0000000000000000, 0x42F0E1EBA9EA3693, 0x85E1C3D753D46D26, 0xC711223CFA3E5BB5, + 0x493366450E42ECDF, 0x0BC387AEA7A8DA4C, 0xCCD2A5925D9681F9, 0x8E224479F47CB76A, 0x9266CC8A1C85D9BE, 0xD0962D61B56FEF2D, + 0x17870F5D4F51B498, 0x5577EEB6E6BB820B, 0xDB55AACF12C73561, 0x99A54B24BB2D03F2, 0x5EB4691841135847, 0x1C4488F3E8F96ED4, + 0x663D78FF90E185EF, 0x24CD9914390BB37C, 0xE3DCBB28C335E8C9, 0xA12C5AC36ADFDE5A, 0x2F0E1EBA9EA36930, 0x6DFEFF5137495FA3, + 0xAAEFDD6DCD770416, 0xE81F3C86649D3285, 0xF45BB4758C645C51, 0xB6AB559E258E6AC2, 0x71BA77A2DFB03177, 0x334A9649765A07E4, + 0xBD68D2308226B08E, 0xFF9833DB2BCC861D, 0x388911E7D1F2DDA8, 0x7A79F00C7818EB3B, 0xCC7AF1FF21C30BDE, 0x8E8A101488293D4D, + 0x499B3228721766F8, 0x0B6BD3C3DBFD506B, 0x854997BA2F81E701, 0xC7B97651866BD192, 0x00A8546D7C558A27, 0x4258B586D5BFBCB4, + 0x5E1C3D753D46D260, 0x1CECDC9E94ACE4F3, 0xDBFDFEA26E92BF46, 0x990D1F49C77889D5, 0x172F5B3033043EBF, 0x55DFBADB9AEE082C, + 0x92CE98E760D05399, 0xD03E790CC93A650A, 0xAA478900B1228E31, 0xE8B768EB18C8B8A2, 0x2FA64AD7E2F6E317, 0x6D56AB3C4B1CD584, + 0xE374EF45BF6062EE, 0xA1840EAE168A547D, 0x66952C92ECB40FC8, 0x2465CD79455E395B, 0x3821458AADA7578F, 0x7AD1A461044D611C, + 0xBDC0865DFE733AA9, 0xFF3067B657990C3A, 0x711223CFA3E5BB50, 0x33E2C2240A0F8DC3, 0xF4F3E018F031D676, 0xB60301F359DBE0E5, + 0xDA050215EA6C212F, 0x98F5E3FE438617BC, 0x5FE4C1C2B9B84C09, 0x1D14202910527A9A, 0x93366450E42ECDF0, 0xD1C685BB4DC4FB63, + 0x16D7A787B7FAA0D6, 0x5427466C1E109645, 0x4863CE9FF6E9F891, 0x0A932F745F03CE02, 0xCD820D48A53D95B7, 0x8F72ECA30CD7A324, + 0x0150A8DAF8AB144E, 0x43A04931514122DD, 0x84B16B0DAB7F7968, 0xC6418AE602954FFB, 0xBC387AEA7A8DA4C0, 0xFEC89B01D3679253, + 0x39D9B93D2959C9E6, 0x7B2958D680B3FF75, 0xF50B1CAF74CF481F, 0xB7FBFD44DD257E8C, 0x70EADF78271B2539, 0x321A3E938EF113AA, + 0x2E5EB66066087D7E, 0x6CAE578BCFE24BED, 0xABBF75B735DC1058, 0xE94F945C9C3626CB, 0x676DD025684A91A1, 0x259D31CEC1A0A732, + 0xE28C13F23B9EFC87, 0xA07CF2199274CA14, 0x167FF3EACBAF2AF1, 0x548F120162451C62, 0x939E303D987B47D7, 0xD16ED1D631917144, + 0x5F4C95AFC5EDC62E, 0x1DBC74446C07F0BD, 0xDAAD56789639AB08, 0x985DB7933FD39D9B, 0x84193F60D72AF34F, 0xC6E9DE8B7EC0C5DC, + 0x01F8FCB784FE9E69, 0x43081D5C2D14A8FA, 0xCD2A5925D9681F90, 0x8FDAB8CE70822903, 0x48CB9AF28ABC72B6, 0x0A3B7B1923564425, + 0x70428B155B4EAF1E, 0x32B26AFEF2A4998D, 0xF5A348C2089AC238, 0xB753A929A170F4AB, 0x3971ED50550C43C1, 0x7B810CBBFCE67552, + 0xBC902E8706D82EE7, 0xFE60CF6CAF321874, 0xE224479F47CB76A0, 0xA0D4A674EE214033, 0x67C58448141F1B86, 0x253565A3BDF52D15, + 0xAB1721DA49899A7F, 0xE9E7C031E063ACEC, 0x2EF6E20D1A5DF759, 0x6C0603E6B3B7C1CA, 0xF6FAE5C07D3274CD, 0xB40A042BD4D8425E, + 0x731B26172EE619EB, 0x31EBC7FC870C2F78, 0xBFC9838573709812, 0xFD39626EDA9AAE81, 0x3A28405220A4F534, 0x78D8A1B9894EC3A7, + 0x649C294A61B7AD73, 0x266CC8A1C85D9BE0, 0xE17DEA9D3263C055, 0xA38D0B769B89F6C6, 0x2DAF4F0F6FF541AC, 0x6F5FAEE4C61F773F, + 0xA84E8CD83C212C8A, 0xEABE6D3395CB1A19, 0x90C79D3FEDD3F122, 0xD2377CD44439C7B1, 0x15265EE8BE079C04, 0x57D6BF0317EDAA97, + 0xD9F4FB7AE3911DFD, 0x9B041A914A7B2B6E, 0x5C1538ADB04570DB, 0x1EE5D94619AF4648, 0x02A151B5F156289C, 0x4051B05E58BC1E0F, + 0x87409262A28245BA, 0xC5B073890B687329, 0x4B9237F0FF14C443, 0x0962D61B56FEF2D0, 0xCE73F427ACC0A965, 0x8C8315CC052A9FF6, + 0x3A80143F5CF17F13, 0x7870F5D4F51B4980, 0xBF61D7E80F251235, 0xFD913603A6CF24A6, 0x73B3727A52B393CC, 0x31439391FB59A55F, + 0xF652B1AD0167FEEA, 0xB4A25046A88DC879, 0xA8E6D8B54074A6AD, 0xEA16395EE99E903E, 0x2D071B6213A0CB8B, 0x6FF7FA89BA4AFD18, + 0xE1D5BEF04E364A72, 0xA3255F1BE7DC7CE1, 0x64347D271DE22754, 0x26C49CCCB40811C7, 0x5CBD6CC0CC10FAFC, 0x1E4D8D2B65FACC6F, + 0xD95CAF179FC497DA, 0x9BAC4EFC362EA149, 0x158E0A85C2521623, 0x577EEB6E6BB820B0, 0x906FC95291867B05, 0xD29F28B9386C4D96, + 0xCEDBA04AD0952342, 0x8C2B41A1797F15D1, 0x4B3A639D83414E64, 0x09CA82762AAB78F7, 0x87E8C60FDED7CF9D, 0xC51827E4773DF90E, + 0x020905D88D03A2BB, 0x40F9E43324E99428, 0x2CFFE7D5975E55E2, 0x6E0F063E3EB46371, 0xA91E2402C48A38C4, 0xEBEEC5E96D600E57, + 0x65CC8190991CB93D, 0x273C607B30F68FAE, 0xE02D4247CAC8D41B, 0xA2DDA3AC6322E288, 0xBE992B5F8BDB8C5C, 0xFC69CAB42231BACF, + 0x3B78E888D80FE17A, 0x7988096371E5D7E9, 0xF7AA4D1A85996083, 0xB55AACF12C735610, 0x724B8ECDD64D0DA5, 0x30BB6F267FA73B36, + 0x4AC29F2A07BFD00D, 0x08327EC1AE55E69E, 0xCF235CFD546BBD2B, 0x8DD3BD16FD818BB8, 0x03F1F96F09FD3CD2, 0x41011884A0170A41, + 0x86103AB85A2951F4, 0xC4E0DB53F3C36767, 0xD8A453A01B3A09B3, 0x9A54B24BB2D03F20, 0x5D45907748EE6495, 0x1FB5719CE1045206, + 0x919735E51578E56C, 0xD367D40EBC92D3FF, 0x1476F63246AC884A, 0x568617D9EF46BED9, 0xE085162AB69D5E3C, 0xA275F7C11F7768AF, + 0x6564D5FDE549331A, 0x279434164CA30589, 0xA9B6706FB8DFB2E3, 0xEB46918411358470, 0x2C57B3B8EB0BDFC5, 0x6EA7525342E1E956, + 0x72E3DAA0AA188782, 0x30133B4B03F2B111, 0xF7021977F9CCEAA4, 0xB5F2F89C5026DC37, 0x3BD0BCE5A45A6B5D, 0x79205D0E0DB05DCE, + 0xBE317F32F78E067B, 0xFCC19ED95E6430E8, 0x86B86ED5267CDBD3, 0xC4488F3E8F96ED40, 0x0359AD0275A8B6F5, 0x41A94CE9DC428066, + 0xCF8B0890283E370C, 0x8D7BE97B81D4019F, 0x4A6ACB477BEA5A2A, 0x089A2AACD2006CB9, 0x14DEA25F3AF9026D, 0x562E43B4931334FE, + 0x913F6188692D6F4B, 0xD3CF8063C0C759D8, 0x5DEDC41A34BBEEB2, 0x1F1D25F19D51D821, 0xD80C07CD676F8394, 0x9AFCE626CE85B507 }; std::uint64_t math::crc64(const void* buffer, std::size_t size, std::uint64_t combine) { diff --git a/core/threading.cc b/core/threading.cc index 4c7f8c8..641e634 100644 --- a/core/threading.cc +++ b/core/threading.cc @@ -3,6 +3,7 @@ #include "core/threading.hh" #include "core/io/cmdline.hh" + #include "core/math/constexpr.hh" constexpr static std::string_view DEFAULT_POOL_SIZE_ARG = "4"; diff --git a/game/client/entity/camera.cc b/game/client/entity/camera.cc index e0b4cb5..c17291f 100644 --- a/game/client/entity/camera.cc +++ b/game/client/entity/camera.cc @@ -3,15 +3,19 @@ #include "client/entity/camera.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/entity/player_move.hh" + #include "client/gui/settings.hh" #include "client/const.hh" diff --git a/game/client/entity/factory.cc b/game/client/entity/factory.cc index 708dc65..f6f6079 100644 --- a/game/client/entity/factory.cc +++ b/game/client/entity/factory.cc @@ -5,6 +5,7 @@ #include "shared/entity/factory.hh" #include "shared/entity/head.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "client/entity/sound_emitter.hh" diff --git a/game/client/entity/interpolation.cc b/game/client/entity/interpolation.cc index 6eb9e65..9eca735 100644 --- a/game/client/entity/interpolation.cc +++ b/game/client/entity/interpolation.cc @@ -6,6 +6,7 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" diff --git a/game/client/entity/listener.cc b/game/client/entity/listener.cc index 2156571..3b1a35b 100644 --- a/game/client/entity/listener.cc +++ b/game/client/entity/listener.cc @@ -3,12 +3,15 @@ #include "client/entity/listener.hh" #include "core/config/number.hh" + #include "core/math/constexpr.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/entity/camera.hh" + #include "client/sound/sound.hh" #include "client/const.hh" diff --git a/game/client/entity/player_look.cc b/game/client/entity/player_look.cc index c633922..715475b 100644 --- a/game/client/entity/player_look.cc +++ b/game/client/entity/player_look.cc @@ -4,16 +4,21 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "shared/entity/head.hh" + #include "shared/world/dimension.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/settings.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/entity/player_move.cc b/game/client/entity/player_move.cc index 4b40efb..fb49754 100644 --- a/game/client/entity/player_move.cc +++ b/game/client/entity/player_move.cc @@ -4,7 +4,9 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" #include "core/math/constexpr.hh" @@ -12,16 +14,21 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/settings.hh" #include "client/gui/status_lines.hh" + #include "client/io/gamepad.hh" + #include "client/sound/sound.hh" + #include "client/world/voxel_sounds.hh" #include "client/const.hh" diff --git a/game/client/entity/sound_emitter.cc b/game/client/entity/sound_emitter.cc index 7ee5cc1..eeb7294 100644 --- a/game/client/entity/sound_emitter.cc +++ b/game/client/entity/sound_emitter.cc @@ -3,15 +3,18 @@ #include "client/entity/sound_emitter.hh" #include "core/config/number.hh" + #include "core/math/constexpr.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/sound/sound.hh" #include "client/globals.hh" diff --git a/game/client/experiments.cc b/game/client/experiments.cc index c9b5e0c..247bce9 100644 --- a/game/client/experiments.cc +++ b/game/client/experiments.cc @@ -11,7 +11,9 @@ #include "client/gui/chat.hh" #include "client/gui/hotbar.hh" #include "client/gui/status_lines.hh" + #include "client/io/glfw.hh" + #include "client/world/player_target.hh" #include "client/globals.hh" diff --git a/game/client/game.cc b/game/client/game.cc index 428e6a3..118ac66 100644 --- a/game/client/game.cc +++ b/game/client/game.cc @@ -5,9 +5,13 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/angles.hh" + #include "core/resource/resource.hh" + #include "core/utils/physfs.hh" #include "shared/entity/collision.hh" @@ -17,8 +21,10 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/game_items.hh" #include "shared/game_voxels.hh" + #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" #include "shared/world/ray_dda.hh" @@ -28,12 +34,14 @@ #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/entity/camera.hh" #include "client/entity/interpolation.hh" #include "client/entity/listener.hh" #include "client/entity/player_look.hh" #include "client/entity/player_move.hh" #include "client/entity/sound_emitter.hh" + #include "client/gui/background.hh" #include "client/gui/bother.hh" #include "client/gui/chat.hh" @@ -52,10 +60,14 @@ #include "client/gui/splash.hh" #include "client/gui/status_lines.hh" #include "client/gui/window_title.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" + #include "client/sound/sound.hh" + #include "client/world/chunk_mesher.hh" #include "client/world/chunk_renderer.hh" #include "client/world/chunk_visibility.hh" diff --git a/game/client/gui/background.cc b/game/client/gui/background.cc index 0c38283..50fef01 100644 --- a/game/client/gui/background.cc +++ b/game/client/gui/background.cc @@ -3,6 +3,7 @@ #include "client/gui/background.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/chat.cc b/game/client/gui/chat.cc index 855c892..6e4498b 100644 --- a/game/client/gui/chat.cc +++ b/game/client/gui/chat.cc @@ -4,19 +4,26 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/resource/resource.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/imdraw_ext.hh" #include "client/gui/language.hh" #include "client/gui/settings.hh" + #include "client/io/glfw.hh" + #include "client/resource/sound_effect.hh" + #include "client/sound/sound.hh" #include "client/game.hh" diff --git a/game/client/gui/crosshair.cc b/game/client/gui/crosshair.cc index 729ede9..29b5fe5 100644 --- a/game/client/gui/crosshair.cc +++ b/game/client/gui/crosshair.cc @@ -3,6 +3,7 @@ #include "client/gui/crosshair.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "client/resource/texture_gui.hh" diff --git a/game/client/gui/direct_connection.cc b/game/client/gui/direct_connection.cc index 0290bd3..37372e2 100644 --- a/game/client/gui/direct_connection.cc +++ b/game/client/gui/direct_connection.cc @@ -3,12 +3,14 @@ #include "client/gui/direct_connection.hh" #include "core/config/boolean.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/hotbar.cc b/game/client/gui/hotbar.cc index a7c3c62..ca058a3 100644 --- a/game/client/gui/hotbar.cc +++ b/game/client/gui/hotbar.cc @@ -3,14 +3,18 @@ #include "client/gui/hotbar.hh" #include "core/io/config_map.hh" + #include "core/resource/resource.hh" #include "shared/world/item_registry.hh" #include "client/config/keybind.hh" + #include "client/gui/settings.hh" #include "client/gui/status_lines.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/imdraw_ext.hh b/game/client/gui/imdraw_ext.hh index 35ee37e..664b702 100644 --- a/game/client/gui/imdraw_ext.hh +++ b/game/client/gui/imdraw_ext.hh @@ -4,8 +4,8 @@ namespace gui::imdraw_ext { -void text_shadow( - const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list); +void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, + ImDrawList* draw_list); void text_shadow(const std::string& text, const ImVec2& position, ImU32 text_color, ImU32 shadow_color, ImFont* font, ImDrawList* draw_list, float font_size); } // namespace gui::imdraw_ext diff --git a/game/client/gui/language.cc b/game/client/gui/language.cc index 3c700a2..f63dd99 100644 --- a/game/client/gui/language.cc +++ b/game/client/gui/language.cc @@ -3,6 +3,7 @@ #include "client/gui/language.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/main_menu.cc b/game/client/gui/main_menu.cc index 5395335..3c68612 100644 --- a/game/client/gui/main_menu.cc +++ b/game/client/gui/main_menu.cc @@ -3,6 +3,7 @@ #include "client/gui/main_menu.hh" #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "core/version.hh" @@ -10,7 +11,9 @@ #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" #include "client/gui/window_title.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/gui/metrics.cc b/game/client/gui/metrics.cc index 234d3b5..57a6319 100644 --- a/game/client/gui/metrics.cc +++ b/game/client/gui/metrics.cc @@ -8,19 +8,21 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/gui/imdraw_ext.hh" #include "client/game.hh" #include "client/globals.hh" #include "client/session.hh" -constexpr static ImGuiWindowFlags WINDOW_FLAGS = - ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoNav; +constexpr static ImGuiWindowFlags WINDOW_FLAGS = ImGuiWindowFlags_NoBackground | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoInputs + | ImGuiWindowFlags_NoNav; static std::basic_string<GLubyte> r_version; static std::basic_string<GLubyte> r_renderer; diff --git a/game/client/gui/play_menu.cc b/game/client/gui/play_menu.cc index dc4ffed..2951bf2 100644 --- a/game/client/gui/play_menu.cc +++ b/game/client/gui/play_menu.cc @@ -3,8 +3,11 @@ #include "client/gui/play_menu.hh" #include "core/config/boolean.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/utils/string.hh" #include "shared/protocol.hh" @@ -12,6 +15,7 @@ #include "client/gui/bother.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" #include "client/game.hh" diff --git a/game/client/gui/scoreboard.cc b/game/client/gui/scoreboard.cc index ad49a69..fabd753 100644 --- a/game/client/gui/scoreboard.cc +++ b/game/client/gui/scoreboard.cc @@ -7,6 +7,7 @@ #include "shared/protocol.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/settings.hh" diff --git a/game/client/gui/settings.cc b/game/client/gui/settings.cc index e8f9bca..693f0d6 100644 --- a/game/client/gui/settings.cc +++ b/game/client/gui/settings.cc @@ -5,14 +5,18 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "client/config/gamepad_axis.hh" #include "client/config/gamepad_button.hh" #include "client/config/keybind.hh" + #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/gui/splash.cc b/game/client/gui/splash.cc index 887e209..440df49 100644 --- a/game/client/gui/splash.cc +++ b/game/client/gui/splash.cc @@ -3,13 +3,18 @@ #include "client/gui/splash.hh" #include "core/io/cmdline.hh" + #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "client/gui/gui_screen.hh" #include "client/gui/language.hh" + #include "client/io/glfw.hh" + #include "client/resource/texture_gui.hh" #include "client/globals.hh" diff --git a/game/client/io/gamepad.cc b/game/client/io/gamepad.cc index d07ee86..3a71920 100644 --- a/game/client/io/gamepad.cc +++ b/game/client/io/gamepad.cc @@ -68,10 +68,13 @@ static void on_glfw_joystick_event(const io::GlfwJoystickEvent& event) active_gamepad_id = INVALID_GAMEPAD_ID; - for(int i = 0; i < NUM_AXES; io::gamepad::last_state.axes[i++] = 0.0f) - ; - for(int i = 0; i < NUM_BUTTONS; io::gamepad::last_state.buttons[i++] = GLFW_RELEASE) - ; + for(int i = 0; i < NUM_AXES; io::gamepad::last_state.axes[i++] = 0.0f) { + // empty + } + + for(int i = 0; i < NUM_BUTTONS; io::gamepad::last_state.buttons[i++] = GLFW_RELEASE) { + // empty + } spdlog::warn("gamepad: disconnected"); @@ -145,7 +148,7 @@ void io::gamepad::update_late(void) if(glfwGetGamepadState(active_gamepad_id, &io::gamepad::state)) { for(int i = 0; i < NUM_AXES; ++i) { if((math::abs(io::gamepad::state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD) - && (math::abs(io::gamepad::last_state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD)) { + && (math::abs(io::gamepad::last_state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD)) { GamepadAxisEvent event; event.action = GLFW_PRESS; event.axis = i; @@ -154,7 +157,7 @@ void io::gamepad::update_late(void) } if((math::abs(io::gamepad::state.axes[i]) <= GAMEPAD_AXIS_EVENT_THRESHOLD) - && (math::abs(io::gamepad::last_state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD)) { + && (math::abs(io::gamepad::last_state.axes[i]) > GAMEPAD_AXIS_EVENT_THRESHOLD)) { GamepadAxisEvent event; event.action = GLFW_RELEASE; event.axis = i; diff --git a/game/client/main.cc b/game/client/main.cc index d7fcb1e..a1185e2 100644 --- a/game/client/main.cc +++ b/game/client/main.cc @@ -2,8 +2,10 @@ #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "core/threading.hh" @@ -13,7 +15,9 @@ #include "shared/splash.hh" #include "client/gui/window_title.hh" + #include "client/io/glfw.hh" + #include "client/resource/sound_effect.hh" #include "client/resource/texture_gui.hh" @@ -122,8 +126,8 @@ static void on_glfw_window_focus(GLFWwindow* window, int focused) ImGui_ImplGlfw_WindowFocusCallback(window, focused); } -static void GLAD_API_PTR on_opengl_message( - GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* param) +static void GLAD_API_PTR on_opengl_message(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, + const void* param) { spdlog::info("opengl: {}", reinterpret_cast<const char*>(message)); } diff --git a/game/client/receive.cc b/game/client/receive.cc index ce7b6ab..a253911 100644 --- a/game/client/receive.cc +++ b/game/client/receive.cc @@ -6,15 +6,18 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/protocol.hh" #include "client/entity/factory.hh" + #include "client/gui/chat.hh" #include "client/gui/gui_screen.hh" #include "client/gui/message_box.hh" #include "client/gui/window_title.hh" + #include "client/sound/sound.hh" #include "client/globals.hh" diff --git a/game/client/resource/sound_effect.cc b/game/client/resource/sound_effect.cc index fad5b18..4fb3e82 100644 --- a/game/client/resource/sound_effect.cc +++ b/game/client/resource/sound_effect.cc @@ -3,6 +3,7 @@ #include "client/resource/sound_effect.hh" #include "core/resource/resource.hh" + #include "core/utils/physfs.hh" #include "client/globals.hh" diff --git a/game/client/screenshot.cc b/game/client/screenshot.cc index 08d8521..9b573ef 100644 --- a/game/client/screenshot.cc +++ b/game/client/screenshot.cc @@ -3,12 +3,15 @@ #include "client/screenshot.hh" #include "core/io/config_map.hh" + #include "core/utils/epoch.hh" #include "client/config/keybind.hh" + #include "client/gui/chat.hh" #include "client/gui/language.hh" #include "client/gui/settings.hh" + #include "client/io/glfw.hh" #include "client/globals.hh" diff --git a/game/client/session.cc b/game/client/session.cc index 5826b02..96bd28a 100644 --- a/game/client/session.cc +++ b/game/client/session.cc @@ -3,12 +3,14 @@ #include "client/session.hh" #include "core/config/string.hh" + #include "core/math/crc64.hh" #include "shared/entity/head.hh" #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" #include "shared/world/voxel_registry.hh" @@ -17,11 +19,13 @@ #include "shared/protocol.hh" #include "client/entity/camera.hh" + #include "client/gui/chat.hh" #include "client/gui/gui_screen.hh" #include "client/gui/message_box.hh" #include "client/gui/progress_bar.hh" #include "client/gui/window_title.hh" + #include "client/world/chunk_visibility.hh" #include "client/game.hh" diff --git a/game/client/sound/sound.cc b/game/client/sound/sound.cc index c77f968..e77289c 100644 --- a/game/client/sound/sound.cc +++ b/game/client/sound/sound.cc @@ -3,8 +3,11 @@ #include "client/sound/sound.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/resource/resource.hh" #include "shared/world/dimension.hh" @@ -14,7 +17,9 @@ #include "client/entity/camera.hh" #include "client/entity/sound_emitter.hh" + #include "client/gui/settings.hh" + #include "client/resource/sound_effect.hh" #include "client/const.hh" diff --git a/game/client/toggles.cc b/game/client/toggles.cc index e6ffc26..833e099 100644 --- a/game/client/toggles.cc +++ b/game/client/toggles.cc @@ -6,6 +6,7 @@ #include "client/gui/chat.hh" #include "client/gui/language.hh" + #include "client/io/gamepad.hh" #include "client/io/glfw.hh" diff --git a/game/client/world/chunk_mesher.cc b/game/client/world/chunk_mesher.cc index 53c4882..e2f1e10 100644 --- a/game/client/world/chunk_mesher.cc +++ b/game/client/world/chunk_mesher.cc @@ -97,8 +97,8 @@ public: private: bool vis_test(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos) const; void push_quad_a(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face); - void push_quad_v( - const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, std::size_t entropy); + void push_quad_v(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, + std::size_t entropy); void make_cube(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, std::size_t entropy); void cache_chunk(const chunk_pos& cpos); @@ -304,8 +304,8 @@ void GL_MeshingTask::push_quad_a(const world::VoxelInfo* info, const glm::fvec3& } } -void GL_MeshingTask::push_quad_v( - const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, std::size_t entropy) +void GL_MeshingTask::push_quad_v(const world::VoxelInfo* info, const glm::fvec3& pos, const glm::fvec2& size, world::voxel_face face, + std::size_t entropy) { const world::voxel_facing facing = get_facing(face, info->type); const world::VoxelTexture& vtex = info->textures[static_cast<std::size_t>(face)]; @@ -319,8 +319,8 @@ void GL_MeshingTask::push_quad_v( } } -void GL_MeshingTask::make_cube( - voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, std::size_t entropy) +void GL_MeshingTask::make_cube(voxel_id voxel, const world::VoxelInfo* info, const local_pos& lpos, world::voxel_vis vis, + std::size_t entropy) { const glm::fvec3 fpos = glm::fvec3(lpos); const glm::fvec2 fsize = glm::fvec2(1.0f, 1.0f); diff --git a/game/client/world/chunk_renderer.cc b/game/client/world/chunk_renderer.cc index fe3a42e..23ce4ec 100644 --- a/game/client/world/chunk_renderer.cc +++ b/game/client/world/chunk_renderer.cc @@ -4,6 +4,7 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" #include "shared/world/chunk.hh" @@ -12,7 +13,9 @@ #include "shared/coord.hh" #include "client/entity/camera.hh" + #include "client/gui/settings.hh" + #include "client/world/chunk_mesher.hh" #include "client/world/chunk_quad.hh" #include "client/world/outline.hh" diff --git a/game/client/world/chunk_visibility.cc b/game/client/world/chunk_visibility.cc index 8f76755..871c04b 100644 --- a/game/client/world/chunk_visibility.cc +++ b/game/client/world/chunk_visibility.cc @@ -3,6 +3,7 @@ #include "client/world/chunk_visibility.hh" #include "core/config/number.hh" + #include "core/math/vectors.hh" #include "shared/world/chunk.hh" diff --git a/game/client/world/voxel_anims.cc b/game/client/world/voxel_anims.cc index 9e5e035..e4d9cf6 100644 --- a/game/client/world/voxel_anims.cc +++ b/game/client/world/voxel_anims.cc @@ -3,7 +3,9 @@ #include "client/world/voxel_anims.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "client/globals.hh" @@ -24,8 +26,8 @@ void world::voxel_anims::init(void) void world::voxel_anims::update(void) { if(globals::curtime >= world::voxel_anims::nextframe) { - world::voxel_anims::nextframe = - globals::curtime + static_cast<std::uint64_t>(1000000.0 / static_cast<float>(base_framerate.get_value())); + world::voxel_anims::nextframe = globals::curtime + + static_cast<std::uint64_t>(1000000.0 / static_cast<float>(base_framerate.get_value())); world::voxel_anims::frame += 1U; } } diff --git a/game/client/world/voxel_atlas.cc b/game/client/world/voxel_atlas.cc index 1018747..512a06a 100644 --- a/game/client/world/voxel_atlas.cc +++ b/game/client/world/voxel_atlas.cc @@ -4,6 +4,7 @@ #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" @@ -71,8 +72,8 @@ static world::AtlasStrip* plane_new_strip(AtlasPlane& plane, const std::vector<s } const std::size_t offset = strip.offset + i; - glTexSubImage3D( - GL_TEXTURE_2D_ARRAY, 0, 0, 0, offset, image->size.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels); + glTexSubImage3D(GL_TEXTURE_2D_ARRAY, 0, 0, 0, offset, image->size.x, image->size.y, 1, GL_RGBA, GL_UNSIGNED_BYTE, + image->pixels); } } diff --git a/game/server/game.cc b/game/server/game.cc index de9af9c..441a2cb 100644 --- a/game/server/game.cc +++ b/game/server/game.cc @@ -4,10 +4,13 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/utils/epoch.hh" #include "shared/entity/collision.hh" @@ -17,6 +20,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/game_items.hh" diff --git a/game/server/main.cc b/game/server/main.cc index b3caf36..9d7026f 100644 --- a/game/server/main.cc +++ b/game/server/main.cc @@ -1,11 +1,15 @@ #include "server/pch.hh" #include "core/config/number.hh" + #include "core/io/cmdline.hh" #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" + #include "core/resource/image.hh" #include "core/resource/resource.hh" + #include "core/utils/epoch.hh" #include "core/threading.hh" diff --git a/game/server/receive.cc b/game/server/receive.cc index 296d664..5c56872 100644 --- a/game/server/receive.cc +++ b/game/server/receive.cc @@ -7,6 +7,7 @@ #include "shared/entity/head.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk_aabb.hh" #include "shared/world/dimension.hh" diff --git a/game/server/sessions.cc b/game/server/sessions.cc index df74e01..0bddcfe 100644 --- a/game/server/sessions.cc +++ b/game/server/sessions.cc @@ -4,9 +4,12 @@ #include "core/config/boolean.hh" #include "core/config/number.hh" + #include "core/io/config_map.hh" + #include "core/math/constexpr.hh" #include "core/math/crc64.hh" + #include "core/utils/string.hh" #include "shared/entity/factory.hh" @@ -14,6 +17,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk.hh" #include "shared/world/dimension.hh" #include "shared/world/item_registry.hh" diff --git a/game/server/whitelist.cc b/game/server/whitelist.cc index 4e53ee8..0807c19 100644 --- a/game/server/whitelist.cc +++ b/game/server/whitelist.cc @@ -4,8 +4,11 @@ #include "core/config/boolean.hh" #include "core/config/string.hh" + #include "core/io/config_map.hh" + #include "core/math/crc64.hh" + #include "core/utils/string.hh" #include "server/game.hh" diff --git a/game/server/world/overworld.hh b/game/server/world/overworld.hh index 3da0401..cc6be91 100644 --- a/game/server/world/overworld.hh +++ b/game/server/world/overworld.hh @@ -3,6 +3,7 @@ #pragma once #include "core/config/number.hh" + #include "core/io/config_map.hh" #include "shared/world/dimension.hh" diff --git a/game/server/world/universe.cc b/game/server/world/universe.cc index fe840da..278d0a9 100644 --- a/game/server/world/universe.cc +++ b/game/server/world/universe.cc @@ -4,8 +4,10 @@ #include "core/config/number.hh" #include "core/config/string.hh" + #include "core/io/buffer.hh" #include "core/io/config_map.hh" + #include "core/utils/epoch.hh" #include "shared/world/chunk.hh" @@ -73,8 +75,8 @@ static void add_new_dimension(world::Dimension* dimension) dimension->init_late(universe_config_seed.get_value()); } -static void internal_save_chunk( - const DimensionMetadata* metadata, const world::Dimension* dimension, const chunk_pos& cpos, const world::Chunk* chunk) +static void internal_save_chunk(const DimensionMetadata* metadata, const world::Dimension* dimension, const chunk_pos& cpos, + const world::Chunk* chunk) { auto path = make_chunk_filename(metadata, cpos); diff --git a/game/server/world/unloader.cc b/game/server/world/unloader.cc index 3600ea2..4a3f4e1 100644 --- a/game/server/world/unloader.cc +++ b/game/server/world/unloader.cc @@ -6,6 +6,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" + #include "shared/world/chunk.hh" #include "shared/world/chunk_aabb.hh" #include "shared/world/dimension.hh" diff --git a/game/shared/entity/collision.cc b/game/shared/entity/collision.cc index 454e96a..4346b68 100644 --- a/game/shared/entity/collision.cc +++ b/game/shared/entity/collision.cc @@ -8,6 +8,7 @@ #include "shared/entity/grounded.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/world/voxel_registry.hh" diff --git a/game/shared/entity/factory.cc b/game/shared/entity/factory.cc index c98306a..619a418 100644 --- a/game/shared/entity/factory.cc +++ b/game/shared/entity/factory.cc @@ -8,6 +8,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/entity/gravity.cc b/game/shared/entity/gravity.cc index f5dd145..f1708aa 100644 --- a/game/shared/entity/gravity.cc +++ b/game/shared/entity/gravity.cc @@ -4,6 +4,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/velocity.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/entity/stasis.cc b/game/shared/entity/stasis.cc index 68d8e9d..3b86294 100644 --- a/game/shared/entity/stasis.cc +++ b/game/shared/entity/stasis.cc @@ -3,6 +3,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" void entity::Stasis::fixed_update(world::Dimension* dimension) diff --git a/game/shared/entity/velocity.cc b/game/shared/entity/velocity.cc index 9e40688..86df445 100644 --- a/game/shared/entity/velocity.cc +++ b/game/shared/entity/velocity.cc @@ -4,6 +4,7 @@ #include "shared/entity/stasis.hh" #include "shared/entity/transform.hh" + #include "shared/world/dimension.hh" #include "shared/globals.hh" diff --git a/game/shared/protocol.cc b/game/shared/protocol.cc index 34b7034..6c18658 100644 --- a/game/shared/protocol.cc +++ b/game/shared/protocol.cc @@ -8,6 +8,7 @@ #include "shared/entity/player.hh" #include "shared/entity/transform.hh" #include "shared/entity/velocity.hh" + #include "shared/world/chunk.hh" #include "shared/world/dimension.hh" diff --git a/game/shared/world/chunk.hh b/game/shared/world/chunk.hh index 5eacf44..4f70453 100644 --- a/game/shared/world/chunk.hh +++ b/game/shared/world/chunk.hh @@ -2,9 +2,10 @@ #define SHARED_CHUNK_HH 1 #pragma once -#include "shared/types.hh" #include "shared/world/voxel_storage.hh" +#include "shared/types.hh" + constexpr static unsigned int BIOME_VOID = 0U; namespace world |