include cleanup
This commit is contained in:
@@ -21,12 +21,12 @@ namespace Game
|
||||
{
|
||||
struct EntityRenderData
|
||||
{
|
||||
Vec4 DotColor{1.0f, 1.0f, 1.0f, 1.0f};
|
||||
Vec4 BaseColor{0.0f, 0.0f, 0.0f, 1.0f};
|
||||
Gen::Vec4 DotColor{1.0f, 1.0f, 1.0f, 1.0f};
|
||||
Gen::Vec4 BaseColor{0.0f, 0.0f, 0.0f, 1.0f};
|
||||
Transform Transform;
|
||||
EMaterial MaterialHandle = EMaterial::UNDEFINED;
|
||||
Generated::TextureHandle TextureHandle;
|
||||
Generated::ModelHandle ModelH;
|
||||
Gen::TextureHandle TextureHandle;
|
||||
Gen::ModelHandle ModelH;
|
||||
bool Visible = true;
|
||||
|
||||
void Render(const Model* models, const Material* materials, const Texture* textures);
|
||||
@@ -135,13 +135,13 @@ namespace Game
|
||||
|
||||
struct WorldPuzzle
|
||||
{
|
||||
static constexpr Vec2 WorldCardSize{10.0f, 10.0f};
|
||||
static constexpr Gen::Vec2 WorldCardSize{10.0f, 10.0f};
|
||||
static constexpr float UICardOffset = 0.21f;
|
||||
Generated::PuzzleData Data;
|
||||
Vec3 WorldPosition;
|
||||
Gen::PuzzleData Data;
|
||||
Gen::Vec3 WorldPosition;
|
||||
PuzzleTileEntityHandle TileHandles[Puzzle::Config::MaxCardsInPuzzle];
|
||||
UIQuadEntityHandle UIPlacedCards[Puzzle::Config::MaxCardsInPuzzle];
|
||||
Generated::PuzPos DraggedCard{-1, -1};
|
||||
Gen::PuzPos DraggedCard{-1, -1};
|
||||
bool IsSetup = false;
|
||||
|
||||
void Setup();
|
||||
@@ -158,7 +158,7 @@ namespace Game
|
||||
CubeHandle PlayerOutsideViewCube;
|
||||
|
||||
public:
|
||||
Generated::StaticPuzzleData PuzzleData;
|
||||
Gen::StaticPuzzleData PuzzleData;
|
||||
WorldPuzzle Puzzles[1];
|
||||
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user