Merge branch 'HEAD' of https://github.com/ugeen4/storm-engine.git into develop

Author: blackmark3000

src/techniques/effects/maineffects.fx

@@ -10,11 +10,10 @@ technique Fader
         AlphaBlendEnable = true;
         SrcBlend = srcalpha;
         DestBlend = invsrcalpha;
-        ColorArg1[0] = diffuse;
-        ColorArg2[0] = texture;
-        ColorOp[0] = modulate;
+        ColorArg1[0] = texture;
+        ColorOp[0] = selectarg1;
         ColorOp[1] = disable;
-        AlphaArg1[0] = diffuse;
+        AlphaArg1[0] = texture;
         AlphaOp[0] = SelectArg1;
         AlphaOp[1] = disable;
     }
@@ -33,17 +32,18 @@ technique FaderWithTips
         AlphaBlendEnable = true;
         SrcBlend = srcalpha;
         DestBlend = invsrcalpha;
-        ColorArg1[0] = diffuse;
-        ColorArg2[0] = texture;
-        ColorOp[0] = modulate;
+        ColorVertex = true;
+        ColorArg1[0] = texture;
+        ColorOp[0] = selectarg1;
         ColorArg1[1] = texture;
         ColorArg2[1] = current;
         ColorOp[1] = blendtexturealpha;
         ColorOp[2] = disable;
-        AlphaArg1[0] = diffuse;
-        AlphaOp[0] = SelectArg1;
-        AlphaArg1[1] = current;
-        AlphaOp[1] = SelectArg1;
+        AlphaArg1[0] = texture;
+        AlphaOp[0] = SelectArg1;        
+        AlphaArg1[1] = texture;
+        AlphaArg2[1] = current;        
+        AlphaOp[1] = blendtexturealpha;
         AlphaOp[2] = disable;
     }
 }
@@ -148,9 +148,11 @@ technique ProgressTech
         AlphaBlendEnable = true;
         SrcBlend = srcalpha;
         DestBlend = invsrcalpha;
+        
         ColorArg1[0] = texture;
         ColorOp[0] = SelectArg1;
         ColorOp[1] = disable;
+        
         AlphaArg1[0] = texture;
         AlphaOp[0] = SelectArg1;
         AlphaOp[1] = disable;
@@ -166,11 +168,15 @@ technique ProgressBackTech
         ZEnable = false;
         CullMode = none;
         AlphaTestEnable = false;
-        AlphaBlendEnable = false;
+        AlphaBlendEnable = true;
+        SrcBlend = srcalpha;
+        DestBlend = invsrcalpha;
         ColorArg1[0] = texture;
-        ColorOp[0] = SelectArg1;
+        ColorOp[0] = selectarg1;
         ColorOp[1] = disable;
-        AlphaOp[0] = disable;
+        AlphaArg1[0] = texture;
+        AlphaOp[0] = SelectArg1;
+        AlphaOp[1] = disable;
     }
 }
 
@@ -184,14 +190,23 @@ technique ProgressBackTechWithTips
         CullMode = none;
         TexCoordIndex[1] = 0;
         AlphaTestEnable = false;
-        AlphaBlendEnable = false;
+        AlphaBlendEnable = true;
+        SrcBlend = srcalpha;
+        DestBlend = invsrcalpha;
+        ColorVertex = true;
+        ColorArg1[0] = diffuse;
         ColorArg1[0] = texture;
-        ColorOp[0] = SelectArg1;
+        ColorOp[0] = selectarg1;
         ColorArg1[1] = texture;
         ColorArg2[1] = current;
         ColorOp[1] = blendtexturealpha;
         ColorOp[2] = disable;
-        AlphaOp[0] = disable;
+        AlphaArg1[0] = texture;
+        AlphaOp[0] = SelectArg1;
+        AlphaArg1[1] = texture;
+        AlphaArg2[1] = current;
+        AlphaOp[1] = blendtexturealpha;
+        AlphaOp[2] = disable;
     }
 }
 

src/techniques/interfaces/game_interface.fx

@@ -783,16 +783,24 @@ technique iInfoShowerPic
         AlphaTestEnable = false;
         AlphaBlendEnable = true;
         ZEnable = false;
-        ColorVertex = true;
-
-        ColorOp[0] = selectarg1;
+//        ColorVertex = true;
+        
         ColorArg1[0] = texture;
-
+        ColorOp[0] = selectarg1;
+//        ColorOp[0] = blendtexturealpha;
+        AlphaArg1[0] = current;
         AlphaOp[0] = SelectArg1;
-        AlphaArg1[0] = texture;
-
-        ColorOp[1] = disable;
         AlphaOp[1] = disable;
+        ColorOp[2] = disable;
+
+//        ColorOp[0] = selectarg1;
+//        ColorArg1[0] = texture;
+
+//        AlphaOp[0] = SelectArg1;
+//        AlphaArg1[0] = texture;
+
+//        ColorOp[1] = disable;
+//        AlphaOp[1] = disable;
     }
 }
 

src/techniques/location/maineffects.fx

@@ -215,6 +215,29 @@ technique LocationModelBlend
     }
 }
 
+technique LocationModelBlendLighting
+{
+    pass p0
+    {
+        Lighting = true;
+        FogEnable = true;
+        AlphaTestEnable = false;
+        AlphaBlendEnable = true;
+        SrcBlend = srcalpha;
+        DestBlend = invsrcalpha;
+        ZEnable = true;
+        ZWriteEnable = false;
+        ColorArg1[0] = texture;
+        ColorArg2[0] = diffuse;
+        ColorOp[0] = modulate2x;
+        ColorOp[1] = disable;
+        AlphaArg1[0] = texture;
+        AlphaArg2[0] = diffuse;
+        AlphaOp[0] = modulate;
+        AlphaOp[1] = disable;
+    }
+}
+
 technique ShootParticles
 {
     pass p0