small fixes
This commit is contained in:
@@ -230,6 +230,7 @@ namespace Gen
|
|||||||
{
|
{
|
||||||
)END";
|
)END";
|
||||||
|
|
||||||
|
// TODO: Sizeof is wrong!! we don't use padding!!
|
||||||
constexpr char MetadataTypeEntry7[] = R"END( TypeDef{sizeof(%s), %u, "%s", %u, {%s}, {%s}, {%s}},
|
constexpr char MetadataTypeEntry7[] = R"END( TypeDef{sizeof(%s), %u, "%s", %u, {%s}, {%s}, {%s}},
|
||||||
)END";
|
)END";
|
||||||
constexpr char MetadataEnd1[] = R"END( };
|
constexpr char MetadataEnd1[] = R"END( };
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
#include "Level.h"
|
#include "Level.h"
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
#include "Puzzle.h"
|
#include "Puzzle.h"
|
||||||
|
#include "bx/bx.h"
|
||||||
#include "rendering/Rendering.h"
|
#include "rendering/Rendering.h"
|
||||||
|
|
||||||
#include "SDL3/SDL_mouse.h"
|
#include "SDL3/SDL_mouse.h"
|
||||||
@@ -437,7 +438,7 @@ namespace Game
|
|||||||
Vec3 cameraPos = camTransform.Position;
|
Vec3 cameraPos = camTransform.Position;
|
||||||
|
|
||||||
// TODO: disable warning & check if parentheses make sense like this
|
// TODO: disable warning & check if parentheses make sense like this
|
||||||
Vec2 uiOffset = Vec2{static_cast<float>(Data.WidthTiles / Puzzle::Config::CardSize - 1),
|
Vec2 uiOffset = Vec2{static_cast<float>(Data.WidthTiles / Puzzle::Config::CardSize) - 1,
|
||||||
static_cast<float>(Data.HeightTiles / Puzzle::Config::CardSize) - 1};
|
static_cast<float>(Data.HeightTiles / Puzzle::Config::CardSize) - 1};
|
||||||
uiOffset *= -UICardOffset * 0.5f;
|
uiOffset *= -UICardOffset * 0.5f;
|
||||||
|
|
||||||
@@ -558,7 +559,7 @@ namespace Game
|
|||||||
{
|
{
|
||||||
auto& cover =
|
auto& cover =
|
||||||
level.PuzzleTileCovers.Get(CoverHandles[cardIdx * Puzzle::Config::MaxCoversInTile + i]);
|
level.PuzzleTileCovers.Get(CoverHandles[cardIdx * Puzzle::Config::MaxCoversInTile + i]);
|
||||||
cover.EData.Visible = true;
|
cover.EData.Visible = IsActive;
|
||||||
cover.EData.ModelH = staticCard.Sockets[i].Model;
|
cover.EData.ModelH = staticCard.Sockets[i].Model;
|
||||||
cover.EData.Transform = tile.EData.Transform;
|
cover.EData.Transform = tile.EData.Transform;
|
||||||
Gen::TranslateLocal(cover.EData.Transform, model.Sockets[i].Pos);
|
Gen::TranslateLocal(cover.EData.Transform, model.Sockets[i].Pos);
|
||||||
|
|||||||
BIN
src/game/data/puzzles/0.pzl
LFS
BIN
src/game/data/puzzles/0.pzl
LFS
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user