Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning game.cpp removing old test code.

Browse Source 
Created static mesh entity
Created debug bar
This commit is contained in:
Patedam
2026-08-10 22:12:31 -04:00
parent ee20c903b2
commit 5566f76a94
7 changed files with 132 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/game.cpp
+53 -62
View File
@@ -1,53 +1,37 @@
#include <Windows.h> // TODO: remove because our dll should not be platform dependant
#undef min
#undef max
#include <game.h>
#include <Controller/DebugCameraController.h>
#include <Core/Common/EnumUtils.h>
#include <Core/HAL/Filesystem/Filesystem.h>
#include <Core/HAL/Keyboard/Keyboard.h>
#include <Core/JulietInit.h>
#include <Core/Logging/LogManager.h>
#include <Core/Memory/MemoryArena.h>
#include <Data/StaticMesh.h>
#include <Entity/Entity.h>
#include <Entity/EntityManager.h>
#include <Graphics/Camera.h>
#include <Graphics/MeshRenderer.h>
#include <imgui.h>
GameState* gGameState = nullptr;
#if JULIET_DEBUG
#include <Debug/DebugTopBar.h>
#endif
namespace
{
GameState* gGameState = nullptr;
}
GameState* GetGameState()
{
return gGameState;
}
// Test code
namespace Game
{
struct Door
{
DECLARE_ENTITY()
bool IsOpened;
};
DEFINE_ENTITY(Door);
struct Rock
{
DECLARE_ENTITY()
int Health;
};
DEFINE_ENTITY(Rock);
} // namespace Game
extern "C" JULIET_API void __cdecl GameShutdown()
{
printf("Shutting down game...\n");
using namespace Juliet;
using namespace Game;
ShutdownEntityManager();
}
@@ -55,7 +39,6 @@ extern "C" JULIET_API void __cdecl GameShutdown()
extern "C" JULIET_API void __cdecl GameUpdate(Juliet::GameData* params, [[maybe_unused]] float deltaTime)
{
using namespace Juliet;
using namespace Game;
gGameState = params->GameState;
if (!gGameState)
@@ -81,60 +64,71 @@ extern "C" JULIET_API void __cdecl GameUpdate(Juliet::GameData* params, [[maybe_
// Entity Use case
InitEntityManager(gameState->World);
auto& manager = GetEntityManager();
Door* door = MakeEntity<Door>(manager, 10.0f, 2.0f);
door->IsOpened = true;
auto& manager = GetEntityManager();
Entity* ent = door->Base;
[[maybe_unused]] Door* stillDoor = DownCast<Door>(ent);
Assert(door == stillDoor);
NonNullPtr mesh = MakeEntity<StaticMesh>(manager, 1.f, 2.f);
Rock* rock = MakeEntity<Rock>(manager, 1.f, 2.f);
rock->Health = 100;
Assert(door->Base != rock->Base);
MeshAssetID cubeAsset = GetCubePrimitiveMeshAssetID();
MeshInstanceID meshInst = CreateMeshInstance(cubeAsset, 0, MatrixIdentity());
rock->Base->MeshInstance = meshInst;
printf("Door is %s\n", door->IsOpened ? "Opened" : "Closed");
printf("Rock has %d health points\n", rock->Health);
MeshAssetID cubeAsset = GetCubePrimitiveMeshAssetID();
MeshInstanceID meshInst = CreateMeshInstance(cubeAsset, 0, MatrixIdentity());
mesh->Base->MeshInstance = meshInst;
// Summer at 2pm lighting
Vector3 sunDirection = { -0.2f, -0.9f, -0.3f };
Vector3 sunColor = { 1.0f, 0.95f, 0.85f };
float ambientIntensity = 0.4f;
Vector3 sunDirection = { -0.2f, -0.9f, -0.3f };
Vector3 sunColor = { 1.0f, 0.95f, 0.85f };
float ambientIntensity = 0.4f;
SetGlobalLight(sunDirection, sunColor, ambientIntensity);
}
#if JULIET_DEBUG
DrawTopBar();
#endif
GameMode previousFrameMode = gGameState->Mode;
if (IsKeyPressed(ScanCode::F1))
{
gGameState->Mode = static_cast<GameMode>((ToUnderlying(gGameState->Mode) + 1) % 2);
if (previousFrameMode == GameMode::Play)
{
gGameState->Mode = GameMode::Debug;
}
else if (previousFrameMode == GameMode::Debug)
{
gGameState->Mode = GameMode::Play;
}
}
if (gGameState->Mode == GameMode::Editor)
{
if (IsKeyPressed(ScanCode::F5))
{
gGameState->Mode = GameMode::Play;
}
}
if (gGameState->Mode == GameMode::Play)
{
if (IsKeyPressed(ScanCode::Escape))
{
gGameState->Mode = GameMode::Editor;
}
// update game
}
// Sync entity transforms to meshes
auto& manager = GetEntityManager();
for (Entity& ent : manager.Entities)
{
if (ent.MeshInstance != static_cast<index_t>(-1))
{
SetMeshInstanceTransform(ent.MeshInstance, MatrixTranslation(ent.X, ent.Y, 0.0f));
}
}
UpdateEntityManager(manager);
if (gGameState->Mode == GameMode::Debug)
{
if (previousFrameMode != gGameState->Mode)
if (previousFrameMode == GameMode::Play)
{
ActivateDebugController();
}
if (IsKeyPressed(ScanCode::Escape))
{
gGameState->Mode = GameMode::Editor;
}
UpdateDebugController(deltaTime);
#if JULIET_DEBUG
@@ -143,11 +137,8 @@ extern "C" JULIET_API void __cdecl GameUpdate(Juliet::GameData* params, [[maybe_
ImGui::End();
#endif
}
else
if (gGameState->Mode != GameMode::Debug && previousFrameMode == GameMode::Debug)
{
if (previousFrameMode != gGameState->Mode)
{
DeactivateDebugController();
}
DeactivateDebugController();
}
}