Skip to content

Commit 7e619e2

Browse files
committed
Added sprite
1 parent 3f08702 commit 7e619e2

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

Engine/include/SceneObjects/Sprite.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@ class Sprite : public Node {
2121
ADDITIVE
2222
};
2323

24-
Sprite(BLENDING blending);
24+
enum class DEPTH_WRITE {
25+
FALSE,
26+
TRUE
27+
};
28+
29+
Sprite(BLENDING blending, DEPTH_WRITE depthWrite);
2530
void loadSprites(std::vector<std::shared_ptr<Texture>> textures);
2631
void numSprites(unsigned int numSprites);
2732
void size(glm::vec2 size);

Engine/src/SceneObjects/Sprite.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct PrivateSprite {
1616

1717
static PrivateSprite privateSprite;
1818

19-
Prisma::Sprite::Sprite(BLENDING blending) : Prisma::Node{} {
19+
Prisma::Sprite::Sprite(BLENDING blending, DEPTH_WRITE depthWrite) : Prisma::Node{} {
2020
//m_spriteShader = std::make_shared<Shader>("../../../Engine/Shaders/SpritePipeline/vertex.glsl",
2121
// "../../../Engine/Shaders/SpritePipeline/fragment.glsl", nullptr);
2222
//m_spriteShader->use();
@@ -86,8 +86,9 @@ Prisma::Sprite::Sprite(BLENDING blending) : Prisma::Node{} {
8686

8787
// Depth settings
8888
auto& DepthStencilDesc = PSOCreateInfo.GraphicsPipeline.DepthStencilDesc;
89-
DepthStencilDesc.DepthEnable = Diligent::True;
90-
DepthStencilDesc.DepthWriteEnable = Diligent::False;
89+
90+
DepthStencilDesc.DepthEnable = true;
91+
DepthStencilDesc.DepthWriteEnable = static_cast<bool>(depthWrite);
9192
DepthStencilDesc.DepthFunc = Diligent::COMPARISON_FUNC_LESS;
9293

9394
// clang-format on

UserEngine/src/ParticleController.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void ParticleController::init(std::shared_ptr<Prisma::Node> root, int numParticl
2222
auto spriteBurst = std::make_shared<Prisma::Texture>();
2323
spriteBurst->loadTexture({"../../../Resources/DefaultScene/sprites/burst.png", true});
2424

25-
auto sprite = std::make_shared<Prisma::Sprite>(Prisma::Sprite::BLENDING::ADDITIVE);
25+
auto sprite = std::make_shared<Prisma::Sprite>(Prisma::Sprite::BLENDING::ADDITIVE,Prisma::Sprite::DEPTH_WRITE::FALSE);
2626

2727
sprite->loadSprites({spriteFire, spriteBurst});
2828
sprite->numSprites(m_numParticles);

UserEngine/src/PlayerController.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,6 @@ void PlayerController::updateKeyboard() {
255255
m_previousClick = Prisma::KEY_D;
256256
m_previousAnimations = WALK;
257257
}
258-
if (glfwGetKey(m_window, Prisma::KEY_G) == GLFW_PRESS) {
259-
m_hidden = !m_hidden;
260-
Prisma::PrismaFunc::getInstance().hiddenMouse(m_hidden);
261-
}
262258
clearVelocity();
263259
}
264260
Prisma::Physics::getInstance().bodyInterface().ActivateBody(id);

0 commit comments

Comments
 (0)