BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed depth sorting for HUD elements.

Browse Source
This commit is contained in:
Tleety
2016-02-11 15:27:07 +01:00
parent 9f657ada4e
commit 6ba1e95da7
6 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Rendering/SpriteJob.h
+6 -3
View File
@@ -17,7 +17,7 @@
struct SpriteJob : RenderJob
{
SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage)
SpriteJob(ComponentWrapper cSprite, Camera* camera, glm::mat4 matrix, World* world, glm::vec4 fillColor, float fillPercentage, bool depthSorted)
: RenderJob()
{
Model = ResourceManager::Load<::Model>("Models/Core/UnitQuad.mesh");
@@ -34,8 +34,11 @@ struct SpriteJob : RenderJob
Color = cSprite["Color"];
Entity = cSprite.EntityID;
Position = Transform::AbsolutePosition(world, cSprite.EntityID);
glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
Depth = viewpos.z;
Depth = 0;
if (depthSorted) {
glm::vec3 viewpos = glm::vec3(camera->ViewMatrix() * glm::vec4(Position, 1));
Depth = viewpos.z;
}
World = world;
FillColor = fillColor;
include/Game/Systems/CapturePointHUDSystem.h
-27
View File
@@ -17,33 +17,6 @@ public:
virtual void Update(double dt) override;
private:
//methods which will take care of specific events
/* EventRelay<CapturePointSystem, Events::TriggerTouch> m_ETriggerTouch;
bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e);
EventRelay<CapturePointSystem, Events::TriggerLeave> m_ETriggerLeave;
bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
EventRelay<CapturePointSystem, Events::Captured> m_ECaptured;
bool CapturePointSystem::OnCaptured(const Events::Captured& e);*/
//bool m_WinnerWasFound = false;
////need to track these variables for the captureSystem to work as per design!
//const int m_NotACapturePoint = 999;
//int m_RedTeamNextPossibleCapturePoint = m_NotACapturePoint;
//int m_BlueTeamNextPossibleCapturePoint = m_NotACapturePoint;
//int m_RedTeamHomeCapturePoint = m_NotACapturePoint;
//int m_BlueTeamHomeCapturePoint = m_NotACapturePoint;
//int m_NumberOfCapturePoints = 0;
//std::map<int, EntityWrapper> m_CapturePointNumberToEntityMap;
////std::vector<ComponentWrapper>
//const double m_CaptureTimeToTakeOver = 15.0;
//bool m_ResetTimers = false;
////vectors which will keep track of enter/leave changes
//std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerTouchVector;
//std::vector<std::tuple<EntityWrapper, EntityWrapper>> m_ETriggerLeaveVector;
};
#endif