asuro/PuzGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

puzzle ui

Browse Source
This commit is contained in:
Asuro
2025-03-30 20:47:09 +02:00
parent c244b997c1
commit 29a3aaf241
5 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/game/Level.cpp
View File

@@ -322,6 +322,7 @@ namespace Game
Level& level = GetInstance().GameLevel;
auto& window = GetShared().Window;
auto& staticCards = Puzzle::GetStaticPuzzleData().Cards;
auto& visuals = Puzzle::GetStaticPuzzleData().Visuals;
Transform& camTransform = GetInstance().Player.PlayerCamTransform;
camTransform.UpdateMatrix();
@@ -360,8 +361,11 @@ namespace Game
bool isValid = Puzzle::IsValid(card.RefCard);
// Tile
tile.EData.Visible = true;
tile.EData.ModelH = isValid ? staticCards[card.RefCard.Idx].ModelHandle : staticCards[0].ModelHandle;
tile.EData.DotColor = visuals.TileDotColor;
tile.EData.BaseColor = visuals.TileBaseColor;
Vec3 cardPos = {
(float)card.Position.X * Puzzle::Config::CardScaleWorld,
@@ -375,10 +379,12 @@ namespace Game
tile.EData.Transform.SetPosition(cardPos);
bx::mtxRotateY(tile.EData.Transform.Rotation.M, card.Rotation * bx::kPi * 0.5f);
// Quad
quad.EData.Visible = isValid;
quad.EData.TextureHandle =
isValid ? staticCards[card.RefCard.Idx].BoardTextureHandle : Gen::TextureHandle{};
quad.EData.DotColor = card.IsLocked ? Vec4{0.0f, 0.0f, 0.0f, 0.0f} : Vec4{1.0f, 1.0f, 1.0f, 1.0f};
quad.EData.DotColor = card.IsLocked ? Puzzle::GetStaticPuzzleData().Visuals.DisabledCardTint
: Vec4{1.0f, 1.0f, 1.0f, 1.0f};
quad.EData.Transform = boardTransform;
quad.EData.Transform.TranslateLocal(Vec3{(float)card.Position.X, (float)card.Position.Y, 0.0f} *
@@ -394,14 +400,20 @@ namespace Game
camTransform.GetPosition(), mousePosWorld, quadPosWorld, quadXWorld, quadZWorld, intersectPos))
{
Vec3 quadSpaceIntersect = quad.EData.Transform.GlobalToLocalPoint(intersectPos);
if (quadSpaceIntersect.x >= -1.0f && quadSpaceIntersect.x <= 1.0f &&
if (isValid && quadSpaceIntersect.x >= -1.0f && quadSpaceIntersect.x <= 1.0f &&
quadSpaceIntersect.z >= -1.0f && quadSpaceIntersect.z <= 1.0f)
{
if (isValid && !card.IsLocked && DraggedCard.X == -1 &&
GetMouseButtonPressedNow(MouseButton::Left))
if (!card.IsLocked && DraggedCard.X == -1)
{
DraggedCard.X = x;
DraggedCard.Y = y;
if (GetMouseButtonPressedNow(MouseButton::Left))
{
DraggedCard.X = x;
DraggedCard.Y = y;
}
if (GetMouseButtonPressedNow(MouseButton::Right))
{
Puzzle::RotateCard(card);
}
}
}
}
@@ -421,8 +433,7 @@ namespace Game
if (GetMouseButtonPressedNow(MouseButton::Right))
{
srcCard.Rotation += 1;
if (srcCard.Rotation >= 4) srcCard.Rotation = 0;
Puzzle::RotateCard(srcCard);
}
if (!GetMouseButton(MouseButton::Left))