diff --git a/Game/Entity/Entity.h b/Game/Entity/Entity.h new file mode 100644 index 0000000..30ff11f --- /dev/null +++ b/Game/Entity/Entity.h @@ -0,0 +1,70 @@ +#pragma once + +#include +#include +#include +#include +#include +#include + +// Add any new fields into the concept below +#define DECLARE_ENTITY(entity) \ + Entity* Base; \ + static const Juliet::Class* Kind; + +// Will register the class globally at launch +#define DEFINE_ENTITY(entity) \ + constexpr Juliet::Class entityKind##entity(#entity, sizeof(#entity) / sizeof(char)); \ + const Juliet::Class* entity::Kind = &entityKind##entity; + +namespace Game +{ + using DerivedType = void*; + + struct Entity final + { + EntityID ID; + const Juliet::Class* Kind; + DerivedType Derived; + float X, Y; + }; + + template + concept EntityConcept = requires(EntityType entity) + { + requires std::same_as; + requires std::same_as; + }; + + template + requires EntityConcept + bool IsA(const Entity* entity) + { + return entity->Kind == EntityType::Kind; + } + + template + requires EntityConcept + EntityType* MakeEntity(EntityManager& manager, float x, float y) + { + EntityType* result = static_cast(Juliet::Calloc(1, sizeof(EntityType))); + Entity* base = result->Base = static_cast(Juliet::Calloc(1, sizeof(Entity))); + base->X = x; + base->Y = y; + base->Derived = result; + base->Kind = EntityType::Kind; + + RegisterEntity(manager, base); + + return result; + } + + template + requires EntityConcept + EntityType* DownCast(Entity* entity) + { + Assert(IsA(entity)); + return static_cast(entity->Derived); + } + +} // namespace Game diff --git a/Game/Entity/EntityManager.cpp b/Game/Entity/EntityManager.cpp new file mode 100644 index 0000000..e41b908 --- /dev/null +++ b/Game/Entity/EntityManager.cpp @@ -0,0 +1,25 @@ +#include + +#include + +namespace Game +{ + namespace + { + EntityManager Manager; + } + + EntityID EntityManager::ID = 0; + + void InitEntityManager() {} + + EntityManager& GetEntityManager() + { + return Manager; + } + + void RegisterEntity(EntityManager& manager, Entity* entity) + { + entity->ID = EntityManager::ID++; + } +} // namespace Game diff --git a/Game/Entity/EntityManager.h b/Game/Entity/EntityManager.h new file mode 100644 index 0000000..10455ef --- /dev/null +++ b/Game/Entity/EntityManager.h @@ -0,0 +1,19 @@ +#pragma once + +#include + +namespace Game +{ + using EntityID = uint64_t; + + struct Entity; + struct EntityManager + { + static EntityID ID; + // May be this should contains the allocator for each entity types + }; + + void InitEntityManager();\ + EntityManager& GetEntityManager(); + void RegisterEntity(EntityManager& manager, Entity* entity); +} diff --git a/Juliet.sln b/Juliet.sln index 1686529..00d6d7b 100644 --- a/Juliet.sln +++ b/Juliet.sln @@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietApp", "JulietApp\Juli {1BBC0B92-E4D8-4838-974B-439C5C501E82} = {1BBC0B92-E4D8-4838-974B-439C5C501E82} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{B7B12DCC-1A69-4371-A9FE-D6E7671497B0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -24,6 +26,10 @@ Global {4B2A0F9C-5F78-4BC9-BEE9-1E58BB85FA79}.Debug|x64.Build.0 = Debug|x64 {4B2A0F9C-5F78-4BC9-BEE9-1E58BB85FA79}.Release|x64.ActiveCfg = Release|x64 {4B2A0F9C-5F78-4BC9-BEE9-1E58BB85FA79}.Release|x64.Build.0 = Release|x64 + {B7B12DCC-1A69-4371-A9FE-D6E7671497B0}.Debug|x64.ActiveCfg = Debug|x64 + {B7B12DCC-1A69-4371-A9FE-D6E7671497B0}.Debug|x64.Build.0 = Debug|x64 + {B7B12DCC-1A69-4371-A9FE-D6E7671497B0}.Release|x64.ActiveCfg = Release|x64 + {B7B12DCC-1A69-4371-A9FE-D6E7671497B0}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Juliet/Juliet.vcxproj b/Juliet/Juliet.vcxproj index 7279447..a018e53 100644 --- a/Juliet/Juliet.vcxproj +++ b/Juliet/Juliet.vcxproj @@ -15,7 +15,7 @@ Win32Proj {1bbc0b92-e4d8-4838-974b-439c5c501e82} Juliet - 10.0 + 10.0.26100.0 @@ -106,6 +106,7 @@ + @@ -131,6 +132,7 @@ + @@ -149,6 +151,7 @@ + @@ -228,6 +231,7 @@ + MultiThreadedDebugDll diff --git a/Juliet/include/Core/Common/CRC32.h b/Juliet/include/Core/Common/CRC32.h new file mode 100644 index 0000000..10d8588 --- /dev/null +++ b/Juliet/include/Core/Common/CRC32.h @@ -0,0 +1,58 @@ +#pragma once + +// From https://web.mit.edu/freebsd/head/sys/libkern/crc32.c + +namespace Juliet +{ + namespace details + { + constexpr uint32_t crc32_tab[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, + 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, 0x646ba8c0, 0xfd62f97a, + 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, + 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, + 0xb6662d3d, 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, 0x6b6b51f4, + 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, + 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, + 0x206f85b3, 0xb966d409, 0xce61e49f, 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, + 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, 0xfed41b76, + 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, + 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, + 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, + 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, + 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a, 0x53b39330, + 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d + }; + } + + consteval uint32 crc32(const char* str, size_t length) + { + const char* p = str; + uint32_t crc = ~0U; + while (length--) + { + crc = details::crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); + } + return crc ^ ~0U; + } + + consteval uint32 operator""_crc32(const char* str, size_t length) + { + return crc32(str, length); + } + +} // namespace Juliet diff --git a/Juliet/include/Core/Common/CoreTypes.h b/Juliet/include/Core/Common/CoreTypes.h index a553826..e4a9e59 100644 --- a/Juliet/include/Core/Common/CoreTypes.h +++ b/Juliet/include/Core/Common/CoreTypes.h @@ -3,27 +3,24 @@ #include #include -namespace Juliet +using uint8 = uint8_t; +using uint16 = uint16_t; +using uint32 = uint32_t; +using uint64 = uint64_t; + +using int8 = int8_t; +using int16 = int16_t; +using int32 = int32_t; +using int64 = int64_t; + +using Byte = std::byte; + +using size_t = std::size_t; + +struct ByteBuffer { - using uint8 = uint8_t; - using uint16 = uint16_t; - using uint32 = uint32_t; - using uint64 = uint64_t; + const Byte* Data; + size_t Size; +}; - using int8 = int8_t; - using int16 = int16_t; - using int32 = int32_t; - using int64 = int64_t; - - using byte = std::byte; - - using size_t = std::size_t; - - struct ByteBuffer - { - const byte* Data; - size_t Size; - }; - - using FunctionPtr = auto (*)(void) -> void; -} // namespace Juliet +using FunctionPtr = auto (*)(void) -> void; diff --git a/Juliet/include/Core/Common/CoreUtils.h b/Juliet/include/Core/Common/CoreUtils.h index 825d249..97e3262 100644 --- a/Juliet/include/Core/Common/CoreUtils.h +++ b/Juliet/include/Core/Common/CoreUtils.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace Juliet { diff --git a/Juliet/include/Core/Memory/Allocator.h b/Juliet/include/Core/Memory/Allocator.h index 13d9b7f..94ce63f 100644 --- a/Juliet/include/Core/Memory/Allocator.h +++ b/Juliet/include/Core/Memory/Allocator.h @@ -5,10 +5,10 @@ namespace Juliet { // Uninitialized allocation - void* Malloc(size_t nb_elem, size_t elem_size); + JULIET_API void* Malloc(size_t nb_elem, size_t elem_size); // Initialized to 0 allocation - void* Calloc(size_t nb_elem, size_t elem_size); - void* Realloc(void* memory, size_t newSize); + JULIET_API void* Calloc(size_t nb_elem, size_t elem_size); + JULIET_API void* Realloc(void* memory, size_t newSize); // Free template diff --git a/Juliet/include/Core/Networking/NetworkPacket.h b/Juliet/include/Core/Networking/NetworkPacket.h index 2e72034..f121878 100644 --- a/Juliet/include/Core/Networking/NetworkPacket.h +++ b/Juliet/include/Core/Networking/NetworkPacket.h @@ -29,7 +29,7 @@ namespace Juliet friend class TcpSocket; private: - Vector Data; + Vector Data; size_t PartialSendIndex = 0; }; } // namespace Juliet diff --git a/Juliet/include/Engine/Class.h b/Juliet/include/Engine/Class.h new file mode 100644 index 0000000..84c1b37 --- /dev/null +++ b/Juliet/include/Engine/Class.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include + +namespace Juliet +{ + struct Class + { + uint32 CRC; +#if JULIET_DEBUG + // TODO: string struct may be + const char* Name; + size_t Name_Length; +#endif + + consteval Class(const char* className, size_t name_length) + { + CRC = crc32(className, name_length); +#if JULIET_DEBUG + // TODO: string struct may be + Name = className; + Name_Length = name_length; +#endif + } + }; + + template + bool IsA(Class& cls) + { + return cls.CRC == type::StaticClass->CRC; + } +} // namespace Juliet diff --git a/Juliet/include/Juliet.h b/Juliet/include/Juliet.h index a4c61c2..6efdf5f 100644 --- a/Juliet/include/Juliet.h +++ b/Juliet/include/Juliet.h @@ -18,4 +18,8 @@ # define JULIET_API (void) // Only Win32 is supported for now # endif #endif + +#if _DEBUG +#define JULIET_DEBUG 1 +#endif // clang-format on diff --git a/Juliet/src/Core/Networking/NetworkPacket.cpp b/Juliet/src/Core/Networking/NetworkPacket.cpp index 19a925f..7bac2f3 100644 --- a/Juliet/src/Core/Networking/NetworkPacket.cpp +++ b/Juliet/src/Core/Networking/NetworkPacket.cpp @@ -3,7 +3,7 @@ #include #include -#define TO_BUFFER(ptr) reinterpret_cast(ptr) +#define TO_BUFFER(ptr) reinterpret_cast(ptr) namespace Juliet { diff --git a/Juliet/src/Core/Networking/TcpSocket.cpp b/Juliet/src/Core/Networking/TcpSocket.cpp index ca3b91b..7e84adf 100644 --- a/Juliet/src/Core/Networking/TcpSocket.cpp +++ b/Juliet/src/Core/Networking/TcpSocket.cpp @@ -26,7 +26,7 @@ namespace Juliet // Because of that we will send the size of the packet first before sending the data. // TODO Use scratch allocator. - Vector scratchVector; + Vector scratchVector; scratchVector.resize(buffer.Size + sizeof(uint32)); // htonl converts uint32 from host byte order to network byte order diff --git a/JulietApp/Editor/EditorMain_win32.cpp b/JulietApp/Editor/EditorMain_win32.cpp index 08c3d0f..98558a0 100644 --- a/JulietApp/Editor/EditorMain_win32.cpp +++ b/JulietApp/Editor/EditorMain_win32.cpp @@ -11,6 +11,7 @@ #include // TODO : Replace with message box from framework + call main and not winmain + subsystem +#include #include #include @@ -33,12 +34,16 @@ void Win32EditorApplication::Init() // TODO : Assign the graphics device to the main window (and detach) Running = MainWindow != nullptr && GraphicsDevice != nullptr; + + DynamicLibrary = LoadDynamicLibrary("Game.dll"); } void Win32EditorApplication::Shutdown() { Log(LogLevel::Message, LogCategory::Editor, "Shutdown Editor Application..."); + UnloadDynamicLibrary(DynamicLibrary); + if (MainWindow) { DestroyPlatformWindow(MainWindow); @@ -65,9 +70,7 @@ void Win32EditorApplication::Update() } // Draw here for now -// 1) Acquire a Command Buffer - - + // 1) Acquire a Command Buffer } bool Win32EditorApplication::IsRunning() diff --git a/JulietApp/Editor/EditorMain_win32.h b/JulietApp/Editor/EditorMain_win32.h index 739647e..86c8d9a 100644 --- a/JulietApp/Editor/EditorMain_win32.h +++ b/JulietApp/Editor/EditorMain_win32.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include namespace Juliet @@ -20,6 +21,7 @@ class Win32EditorApplication : public Juliet::IApplication private: Juliet::Window* MainWindow = {}; Juliet::GraphicsDevice* GraphicsDevice = {}; + Juliet::DynamicLibrary* DynamicLibrary = {}; bool Running = false; };