New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

This commit is contained in:
Tleety
2016-03-13 01:23:51 +01:00
parent dfc30f4693
commit f6a8534c15
23 changed files with 1713 additions and 177 deletions
+3 -3
View File
@@ -54,7 +54,7 @@ struct SpriteJob : RenderJob
if((bool)cSprite["KeepRatio"] == true) {
if(scale.y >= scale.x) {
ScaleY = (scale.x)/(scale.y);
ScaleY = (scale.y)/(scale.x);
ScaleX = 1.f;
} else {
ScaleY = 1.f;
@@ -90,8 +90,8 @@ struct SpriteJob : RenderJob
bool Pickable;
bool IsIndicator = false;
bool BlurBackground = false;
float ScaleX = 1;
float ScaleY = 1;
float ScaleX = 1.f;
float ScaleY = 1.f;
bool Linear = false;
glm::vec4 FillColor = glm::vec4(0);
+21
View File
@@ -0,0 +1,21 @@
#ifndef FadeOutSystem_h__
#define FadeOutSystem_h__
#include "Core/System.h"
class FadeOutSystem : public PureSystem
{
public:
FadeOutSystem(SystemParams params)
: System(params)
, PureSystem("FadeOut")
{
}
virtual void UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFadeOut, double dt) override;
private:
};
#endif