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

Merge remote-tracking branch 'origin/master' into particles

Browse Source 
Conflicts:
	src/GUI/GameFrame.h
	src/GUI/TextureFrame.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-06-02 17:37:25 +02:00
parent 756107363e 94fc516a69
commit 349fab54a4
13 changed files with 262 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GUI/TextureFrame.h
+48 -5
View File
@@ -13,7 +13,10 @@ public:
TextureFrame(Frame* parent, std::string name)
: Frame(parent, name)
, m_Texture(nullptr)
, m_FadeTexture(nullptr)
, m_Color(glm::vec4(1.f, 1.f, 1.f, 1.f))
, m_FadeDuration(0.f)
, m_CurrentFade(1.f)
{ }
void Draw(std::shared_ptr<Renderer> renderer) override
@@ -22,13 +25,28 @@ public:
return;
RenderQueue.Clear();
SpriteJob job;
job.TextureID = m_Texture->ResourceID;
job.Texture = *m_Texture;
job.Color = m_Color;
RenderQueue.Forward.Add(job);
// Main texture
{
SpriteJob job;
job.TextureID = m_Texture->ResourceID;
job.Texture = *m_Texture;
job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a * m_CurrentFade);
RenderQueue.Forward.Add(job);
}
// Texture while fading
if (m_FadeTexture && m_CurrentFade < 1)
{
SpriteJob job;
job.TextureID = m_FadeTexture->ResourceID;
job.Texture = *m_FadeTexture;
job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a);
RenderQueue.Forward.Add(job);
}
renderer->SetCamera(nullptr);
renderer->SetViewport(Rectangle(Left(), Top(), Width, Height));
renderer->DrawFrame(RenderQueue);
}
@@ -38,12 +56,37 @@ public:
m_Texture = ResourceManager->Load<::Texture>("Texture", resourceName);
}
void FadeToTexture(std::string resourceName, double duration)
{
m_FadeTexture = m_Texture;
SetTexture(resourceName);
m_FadeDuration = duration;
m_CurrentFade = 0.f;
}
void Update(double dt) override
{
if (m_CurrentFade < 1)
{
m_CurrentFade += dt / m_FadeDuration;
if (m_CurrentFade > 1)
{
m_FadeTexture = nullptr;
m_CurrentFade = 1;
m_FadeDuration = 0;
}
}
}
glm::vec4 Color() const { return m_Color; }
void SetColor(glm::vec4 val) { m_Color = val; }
protected:
::Texture* m_Texture;
::Texture* m_FadeTexture;
glm::vec4 m_Color;
float m_FadeDuration;
float m_CurrentFade;
};