Skip to content

Commit a3adfe8

Browse files
committed
update some techniques for LE
1 parent 69b48a4 commit a3adfe8

File tree

3 files changed

+70
-24
lines changed

3 files changed

+70
-24
lines changed

src/techniques/effects/maineffects.fx

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ technique Fader
1010
AlphaBlendEnable = true;
1111
SrcBlend = srcalpha;
1212
DestBlend = invsrcalpha;
13-
ColorArg1[0] = diffuse;
14-
ColorArg2[0] = texture;
15-
ColorOp[0] = modulate;
13+
ColorArg1[0] = texture;
14+
ColorOp[0] = selectarg1;
1615
ColorOp[1] = disable;
17-
AlphaArg1[0] = diffuse;
16+
AlphaArg1[0] = texture;
1817
AlphaOp[0] = SelectArg1;
1918
AlphaOp[1] = disable;
2019
}
@@ -33,17 +32,18 @@ technique FaderWithTips
3332
AlphaBlendEnable = true;
3433
SrcBlend = srcalpha;
3534
DestBlend = invsrcalpha;
36-
ColorArg1[0] = diffuse;
37-
ColorArg2[0] = texture;
38-
ColorOp[0] = modulate;
35+
ColorVertex = true;
36+
ColorArg1[0] = texture;
37+
ColorOp[0] = selectarg1;
3938
ColorArg1[1] = texture;
4039
ColorArg2[1] = current;
4140
ColorOp[1] = blendtexturealpha;
4241
ColorOp[2] = disable;
43-
AlphaArg1[0] = diffuse;
44-
AlphaOp[0] = SelectArg1;
45-
AlphaArg1[1] = current;
46-
AlphaOp[1] = SelectArg1;
42+
AlphaArg1[0] = texture;
43+
AlphaOp[0] = SelectArg1;
44+
AlphaArg1[1] = texture;
45+
AlphaArg2[1] = current;
46+
AlphaOp[1] = blendtexturealpha;
4747
AlphaOp[2] = disable;
4848
}
4949
}
@@ -148,9 +148,11 @@ technique ProgressTech
148148
AlphaBlendEnable = true;
149149
SrcBlend = srcalpha;
150150
DestBlend = invsrcalpha;
151+
151152
ColorArg1[0] = texture;
152153
ColorOp[0] = SelectArg1;
153154
ColorOp[1] = disable;
155+
154156
AlphaArg1[0] = texture;
155157
AlphaOp[0] = SelectArg1;
156158
AlphaOp[1] = disable;
@@ -166,11 +168,15 @@ technique ProgressBackTech
166168
ZEnable = false;
167169
CullMode = none;
168170
AlphaTestEnable = false;
169-
AlphaBlendEnable = false;
171+
AlphaBlendEnable = true;
172+
SrcBlend = srcalpha;
173+
DestBlend = invsrcalpha;
170174
ColorArg1[0] = texture;
171-
ColorOp[0] = SelectArg1;
175+
ColorOp[0] = selectarg1;
172176
ColorOp[1] = disable;
173-
AlphaOp[0] = disable;
177+
AlphaArg1[0] = texture;
178+
AlphaOp[0] = SelectArg1;
179+
AlphaOp[1] = disable;
174180
}
175181
}
176182

@@ -184,14 +190,23 @@ technique ProgressBackTechWithTips
184190
CullMode = none;
185191
TexCoordIndex[1] = 0;
186192
AlphaTestEnable = false;
187-
AlphaBlendEnable = false;
193+
AlphaBlendEnable = true;
194+
SrcBlend = srcalpha;
195+
DestBlend = invsrcalpha;
196+
ColorVertex = true;
197+
ColorArg1[0] = diffuse;
188198
ColorArg1[0] = texture;
189-
ColorOp[0] = SelectArg1;
199+
ColorOp[0] = selectarg1;
190200
ColorArg1[1] = texture;
191201
ColorArg2[1] = current;
192202
ColorOp[1] = blendtexturealpha;
193203
ColorOp[2] = disable;
194-
AlphaOp[0] = disable;
204+
AlphaArg1[0] = texture;
205+
AlphaOp[0] = SelectArg1;
206+
AlphaArg1[1] = texture;
207+
AlphaArg2[1] = current;
208+
AlphaOp[1] = blendtexturealpha;
209+
AlphaOp[2] = disable;
195210
}
196211
}
197212

src/techniques/interfaces/game_interface.fx

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -783,16 +783,24 @@ technique iInfoShowerPic
783783
AlphaTestEnable = false;
784784
AlphaBlendEnable = true;
785785
ZEnable = false;
786-
ColorVertex = true;
787-
788-
ColorOp[0] = selectarg1;
786+
// ColorVertex = true;
787+
789788
ColorArg1[0] = texture;
790-
789+
ColorOp[0] = selectarg1;
790+
// ColorOp[0] = blendtexturealpha;
791+
AlphaArg1[0] = current;
791792
AlphaOp[0] = SelectArg1;
792-
AlphaArg1[0] = texture;
793-
794-
ColorOp[1] = disable;
795793
AlphaOp[1] = disable;
794+
ColorOp[2] = disable;
795+
796+
// ColorOp[0] = selectarg1;
797+
// ColorArg1[0] = texture;
798+
799+
// AlphaOp[0] = SelectArg1;
800+
// AlphaArg1[0] = texture;
801+
802+
// ColorOp[1] = disable;
803+
// AlphaOp[1] = disable;
796804
}
797805
}
798806

src/techniques/location/maineffects.fx

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,29 @@ technique LocationModelBlend
215215
}
216216
}
217217

218+
technique LocationModelBlendLighting
219+
{
220+
pass p0
221+
{
222+
Lighting = true;
223+
FogEnable = true;
224+
AlphaTestEnable = false;
225+
AlphaBlendEnable = true;
226+
SrcBlend = srcalpha;
227+
DestBlend = invsrcalpha;
228+
ZEnable = true;
229+
ZWriteEnable = false;
230+
ColorArg1[0] = texture;
231+
ColorArg2[0] = diffuse;
232+
ColorOp[0] = modulate2x;
233+
ColorOp[1] = disable;
234+
AlphaArg1[0] = texture;
235+
AlphaArg2[0] = diffuse;
236+
AlphaOp[0] = modulate;
237+
AlphaOp[1] = disable;
238+
}
239+
}
240+
218241
technique ShootParticles
219242
{
220243
pass p0

0 commit comments

Comments
 (0)