Commit: 3f6bd3d347c7c177829794c47a8c1d6a8a20415d - ikemen (git)

Commit MetaInfo

• Revision: 3f6bd3d347c7c177829794c47a8c1d6a8a20415d (tree)
• Time: 2017-03-05 14:11:55
• Author: SUEHIRO <supersuehiro@user...>
• Commiter: SUEHIRO

Log Message

xscale, yscale がマイナスだと回転が反転するのを修正

Change Summary

• modified: ssz/char.ssz
• modified: ssz/sff.ssz

Incremental Difference

--- a/ssz/char.ssz
+++ b/ssz/char.ssz
@@ -99,7 +99,7 @@ public void addAnimList(
     as~screen = `scr;
     as~xscl = `xs;
     as~yscl = `ys;
-    as~angle = (`ax < 0.0) == (`ay < 0.0) ? `an : -`an;
+    as~angle = `an;
     as~oVer = `oVer;
     as~bright = `b;
     as~axscl = `ax;
@@ -3094,7 +3094,8 @@ public &Char
       float an;
       branch{
       cond `ls(.lsANGLEDRAW):
-        an = `sysfvar[.fANGLE] == 0.0 ? 360.0 : `sysfvar[.fANGLE];
+        an = `sysfvar[.fANGLE] == 0.0 ? 360.0
+        : `facing > 0 ? `sysfvar[.fANGLE] : -`sysfvar[.fANGLE];
       else:
         an = 0.0;
       }
@@ -5479,7 +5480,7 @@ public void Explod::update(bool oVer, int playerNo)
       .addAnimList(
         a=, `ani, `sprpriority, `x, `y, screen,
         (float)`facing*`scalex, (float)`vfacing*`scaley,
-        `scalex < 0.0 == `scaley < 0.0 ? `angle : -`angle,
+        `facing < 0 == `vfacing < 0 ? `angle : -`angle,
         oVer, 1.0, 1.0, `alphas < 0 ? (int)-1 : `alphas,
         `alphad, playerNo == .superplayer,
         pfx, `shadowr<<16 | (`shadowg&255)<<8 | (`shadowb&255),

--- a/ssz/sff.ssz
+++ b/ssz/sff.ssz
@@ -1300,7 +1300,6 @@ public &Anim<frame_t>
     `exParam(`frames[`drawidx]=, h=, v=, agl=);
     float rx = x+xs*h*(float)`frames[`drawidx].x+(float).com.GameWidth/2.0;
   /?/*.cfg.OpenGL:
-    agl *= (float)((xs < 0.0 ? -1: 1) * (ys < 0.0 ? -1: 1));
     `spr~glDraw(
       `palFoo(fx), `mask, #(xs*h)*(float)`spr~rct.x*.com.WidthScale,
       #(ys*v)*(float)`spr~rct.y*.com.HeightScale, `tile=,
@@ -1316,7 +1315,6 @@ public &Anim<frame_t>
         1.0, 1.0, xs, xs, ys, 0.0, (float).com.GameWidth/2.0, fx, false);
         ret;
     }
-    agl *= (float)((xs < 0.0 ? -1: 1) * (ys < 0.0 ? -1: 1));
     .m.limRange!float?(xs=, -16000.0/.com.WidthScale, 16000.0/.com.WidthScale);
     .m.limRange!float?(
       ys=, -16000.0/.com.HeightScale, 16000.0/.com.HeightScale);
@@ -1340,7 +1338,6 @@ public &Anim<frame_t>
     `exParam(`frames[`drawidx]=, h=, v=, agl=);
     float x2 = x + xs*h*(float)`frames[`drawidx].x;
     float y2 = y + ys*vscale*v*(float)`frames[`drawidx].y;
-    agl *= (float)((xs < 0.0 ? -1: 1) * (ys < 0.0 ? -1: 1));
   /?/*.cfg.OpenGL:
     if(color != 0x0 && `spr~rle != -12) loop{index i = 0; do:
       .com.tmppl[i] = color;