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

Muzzleflash now very nice

Browse Source
This commit is contained in:
Tleety
2016-03-13 02:25:11 +01:00
parent bbe61f300c
commit 8d809f30f7
4 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Components/Fade.xml
+1
View File
@@ -3,4 +3,5 @@
<FadeTime>1</FadeTime>
<Time>0</Time>
<Out>true</Out>
<Reverse>false</Reverse>
</Fade>
resources/Schema/Components/Fade.xsd
+3
View File
@@ -11,6 +11,9 @@
<xs:element name="Out" type="t:bool" minOccurs="0">
<xs:annotation><xs:documentation>If the entity should fade out or in.</xs:documentation></xs:annotation>
</xs:element>
<xs:element name="Reverse" type="t:bool" minOccurs="0">
<xs:annotation><xs:documentation>If the entity should reverse the fade after finishing, this will double the speed.</xs:documentation></xs:annotation>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
resources/Schema/Entities/MuzzleFlashBlue.xml
+33 -1
View File
@@ -3,7 +3,7 @@
<Components>
<c:Lifetime>
<Lifetime>0.039999999105930328</Lifetime>
<Lifetime>0.08</Lifetime>
</c:Lifetime>
<c:Transform/>
</Components>
@@ -16,6 +16,10 @@
<Children>
<Entity name="Cone1Outside">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/Cone1Outside.mesh</Resource>
@@ -28,6 +32,10 @@
</Entity>
<Entity name="Cone1Inside">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/Cone1Inside.mesh</Resource>
@@ -49,6 +57,10 @@
<Children>
<Entity name="Cone2Inside">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/Cone2Inside.mesh</Resource>
@@ -61,6 +73,10 @@
</Entity>
<Entity name="Cone2Outside">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/Cone2Outside.mesh</Resource>
@@ -82,6 +98,10 @@
<Children>
<Entity name="PlaneLeft">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/PlaneLeft.mesh</Resource>
@@ -94,6 +114,10 @@
</Entity>
<Entity name="PlaneRight">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/PlaneRight.mesh</Resource>
@@ -106,6 +130,10 @@
</Entity>
<Entity name="PlaneUp">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/PlaneUp.mesh</Resource>
@@ -118,6 +146,10 @@
</Entity>
<Entity name="PlaneDown">
<Components>
<c:Fade>
<FadeTime>0.08</FadeTime>
<Reverse>true</Reverse>
</c:Fade>
<c:Model>
<GlowIntensity>2</GlowIntensity>
<Resource>Models/Effects/MuzzleFlash/Blue/PlaneDown.mesh</Resource>
src/Game/Systems/FadeSystem.cpp
+12
View File
@@ -15,15 +15,27 @@ void FadeSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cFade,
dTime *= -1;
}
if((bool)cFade["Reverse"]) {
dTime *= 2;
}
double fadeTime = cFade["FadeTime"];
double& currentTime = cFade["Time"];
currentTime += dTime;
if(currentTime > fadeTime) {
currentTime = 0.0;
if ((bool)cFade["Reverse"]) {
(bool&)cFade["Out"] = !(bool)cFade["Out"];
currentTime = fadeTime;
}
}
if(currentTime < 0.0) {
currentTime = fadeTime;
if ((bool)cFade["Reverse"]) {
(bool&)cFade["Out"] = !(bool)cFade["Out"];
currentTime = 0.0;
}
}
double ratio = currentTime/fadeTime;