Commit: ed23f5a21efdf715c8ceb7bf1f764cee0505b05a - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: ed23f5a21efdf715c8ceb7bf1f764cee0505b05a (tree)
• Time: 2017-05-02 18:43:41
• Author: SUEHIRO <supersuehiro@user...>
• Commiter: SUEHIRO

Log Message

AngleDraw の scale の処理を修正

Change Summary

• modified: src/bytecode.go
• modified: src/compiler.go

Incremental Difference

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -4141,8 +4141,10 @@ func (sc angleDraw) Run(c *Char, _ []int32) bool {
 		case angleDraw_value:
 			c.angleSet(exp[0].evalF(c))
 		case angleDraw_scale:
-			c.angleScalse[0] = exp[0].evalF(c)
-			c.angleScalse[1] = exp[1].evalF(c)
+			c.angleScalse[0] *= exp[0].evalF(c)
+			if len(exp) > 1 {
+				c.angleScalse[1] *= exp[1].evalF(c)
+			}
 		}
 		return true
 	})

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -5353,17 +5353,8 @@ func (c *Compiler) angleDraw(is IniSection, sc *StateControllerBase,
 			angleDraw_value, VT_Float, 1, false); err != nil {
 			return err
 		}
-		if err := c.stateParam(is, "scale", func(data string) error {
-			bes, err := c.exprs(data, VT_Float, 2)
-			if err != nil {
-				return err
-			}
-			if len(bes) < 2 {
-				return Error("scaleの要素が足りません")
-			}
-			sc.add(angleDraw_scale, bes)
-			return nil
-		}); err != nil {
+		if err := c.paramValue(is, sc, "scale",
+			angleDraw_scale, VT_Float, 2, false); err != nil {
 			return err
 		}
 		return nil