use mat32.V2 instead of mat32.Vec2

Author: kkoreilly

grid/align.go

@@ -62,7 +62,7 @@ func (gv *GridView) AlignMin(aa AlignAnchors, dim mat32.Dims, act string) {
 	svoff := sv.WinBBox.Min
 	sv.UndoSave(act, es.SelectedNamesString())
 	abb, an := gv.AlignAnchorBBox(aa)
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	odim := mat32.OtherDim(dim)
 	for sn := range es.Selected {
 		if sn == an {
@@ -87,7 +87,7 @@ func (gv *GridView) AlignMinAnchor(aa AlignAnchors, dim mat32.Dims, act string)
 	svoff := sv.WinBBox.Min
 	sv.UndoSave(act, es.SelectedNamesString())
 	abb, an := gv.AlignAnchorBBox(aa)
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	odim := mat32.OtherDim(dim)
 	for sn := range es.Selected {
 		if sn == an {
@@ -112,7 +112,7 @@ func (gv *GridView) AlignMax(aa AlignAnchors, dim mat32.Dims, act string) {
 	svoff := sv.WinBBox.Min
 	sv.UndoSave(act, es.SelectedNamesString())
 	abb, an := gv.AlignAnchorBBox(aa)
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	odim := mat32.OtherDim(dim)
 	for sn := range es.Selected {
 		if sn == an {
@@ -137,7 +137,7 @@ func (gv *GridView) AlignMaxAnchor(aa AlignAnchors, dim mat32.Dims, act string)
 	svoff := sv.WinBBox.Min
 	sv.UndoSave(act, es.SelectedNamesString())
 	abb, an := gv.AlignAnchorBBox(aa)
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	odim := mat32.OtherDim(dim)
 	for sn := range es.Selected {
 		if sn == an {
@@ -163,7 +163,7 @@ func (gv *GridView) AlignCenter(aa AlignAnchors, dim mat32.Dims, act string) {
 	sv.UndoSave(act, es.SelectedNamesString())
 	abb, an := gv.AlignAnchorBBox(aa)
 	ctr := mat32.NewVec2FmPoint(abb.Min.Add(abb.Max)).MulScalar(0.5)
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	odim := mat32.OtherDim(dim)
 	for sn := range es.Selected {
 		if sn == an {

grid/bbox.go

@@ -131,9 +131,9 @@ func (ev BBoxPoints) PointRect(bb image.Rectangle) mat32.Vec2 {
 	val := ev.ValRect(bb)
 	switch ev {
 	case BBLeft, BBCenter, BBRight:
-		return mat32.Vec2{val, 0.5 * float32(bb.Min.Y+bb.Max.Y)}
+		return mat32.V2(val, 0.5*float32(bb.Min.Y+bb.Max.Y))
 	default:
-		return mat32.Vec2{0.5 * float32(bb.Min.X+bb.Max.X), val}
+		return mat32.V2(0.5*float32(bb.Min.X+bb.Max.X), val)
 	}
 }
 
@@ -144,9 +144,9 @@ func (ev BBoxPoints) PointBox(bb mat32.Box2) mat32.Vec2 {
 	val := ev.ValBox(bb)
 	switch ev {
 	case BBLeft, BBCenter, BBRight:
-		return mat32.Vec2{val, 0.5 * (bb.Min.Y + bb.Max.Y)}
+		return mat32.V2(val, 0.5*(bb.Min.Y+bb.Max.Y))
 	default:
-		return mat32.Vec2{0.5 * (bb.Min.X + bb.Max.X), val}
+		return mat32.V2(0.5*(bb.Min.X+bb.Max.X), val)
 	}
 }
 

grid/dashes.go

@@ -196,7 +196,7 @@ func DashIconsInit() {
 		ic := &svg.Icon{}
 		ic.InitName(ic, k)
 		ic.SetProp("width", units.NewCh(20))
-		ic.ViewBox.Size = mat32.Vec2{1, 1}
+		ic.ViewBox.Size = mat32.V2(1, 1)
 		p := svg.AddNewPath(ic, "p", "M 0.05 0.5 .95 0.5 Z")
 		p.SetProp("stroke-width", units.NewPct(2))
 		p.SetProp("stroke-dasharray", DashString(DashMulWidth(.05, v)))

grid/edits.go

@@ -558,7 +558,7 @@ func (gr *Gradient) UpdateIcon() {
 	if err != nil {
 		ic = &svg.Icon{}
 		ic.InitName(ic, nm)
-		ic.ViewBox.Size = mat32.Vec2{1, 1}
+		ic.ViewBox.Size = mat32.V2(1, 1)
 		ic.SetProp("width", units.NewCh(5))
 		svg.CurIconSet[nm] = ic
 	} else {

grid/manip.go

@@ -338,7 +338,7 @@ func (sv *SVGView) DragMove(win *gi.Window, me *mouse.DragEvent) {
 	tdel := es.DragSelEffBBox.Min.Sub(es.DragSelStartBBox.Min)
 	for itm, ss := range es.Selected {
 		itm.ReadGeom(ss.InitGeom)
-		itm.ApplyDeltaTransform(tdel, mat32.Vec2{1, 1}, 0, pt)
+		itm.ApplyDeltaTransform(tdel, mat32.V2(1, 1), 0, pt)
 	}
 	sv.SetBBoxSpritePos(SpReshapeBBox, 0, es.DragSelEffBBox)
 	sv.SetSelSpritePos()
@@ -531,7 +531,7 @@ func (sv *SVGView) SpriteRotateDrag(sp Sprites, delta image.Point, win *gi.Windo
 	svoff := mat32.NewVec2FmPoint(sv.WinBBox.Min)
 	pt = pt.Sub(svoff)
 	del := mat32.Vec2{}
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	for itm, ss := range es.Selected {
 		itm.ReadGeom(ss.InitGeom)
 		itm.ApplyDeltaTransform(del, sc, ang, pt)

grid/markers.go

@@ -317,7 +317,7 @@ func MarkerIconsInit() {
 		ic.InitName(ic, "marker-"+k) // keep it distinct with marker- prefix
 		ic.SetProp("width", units.NewCh(6))
 		ic.SetProp("height", units.NewEm(2))
-		ic.ViewBox.Size = mat32.Vec2{1, 1}
+		ic.ViewBox.Size = mat32.V2(1, 1)
 		var p *svg.Path
 		lk := strings.ToLower(k)
 		start := true

grid/path.go

@@ -262,8 +262,8 @@ func (sv *SVGView) PathNodeSetOnePoint(path *svg.Path, pts []*PathNode, pidx int
 		pn := pts[i]
 		wbmin := mat32.NewVec2FmPoint(path.WinBBox.Min)
 		pt := wbmin.Sub(svoff)
-		xf, lpt := path.DeltaTransform(dv, mat32.Vec2{1, 1}, 0, pt, true) // include self
-		npt := xf.MulVec2AsPtCtr(pn.Cp, lpt)                              // transform point to new abs coords
+		xf, lpt := path.DeltaTransform(dv, mat32.V2(1, 1), 0, pt, true) // include self
+		npt := xf.MulVec2AsPtCtr(pn.Cp, lpt)                            // transform point to new abs coords
 		sv.PathNodeSetPoint(path, pn, npt)
 		if i == pidx {
 			dv = dv.MulScalar(-1)

grid/select.go

@@ -429,7 +429,7 @@ func (gv *GridView) SelRotate(deg float32) {
 
 	svoff := sv.WinBBox.Min
 	del := mat32.Vec2{}
-	sc := mat32.Vec2{1, 1}
+	sc := mat32.V2(1, 1)
 	rot := mat32.DegToRad(deg)
 	for sn := range es.Selected {
 		sng := sn.AsSVGNode()
@@ -452,7 +452,7 @@ func (gv *GridView) SelScale(scx, scy float32) {
 
 	svoff := sv.WinBBox.Min
 	del := mat32.Vec2{}
-	sc := mat32.Vec2{scx, scy}
+	sc := mat32.V2(scx, scy)
 	for sn := range es.Selected {
 		sng := sn.AsSVGNode()
 		sz := mat32.NewVec2FmPoint(sng.WinBBox.Size())

grid/svgview.go

@@ -515,7 +515,7 @@ func (sv *SVGView) ResizeToContents(grid_off bool) {
 
 	bsz = bsz.DivScalar(sv.Scale)
 
-	sv.TransformAllLeaves(treff, mat32.Vec2{1, 1}, 0, mat32.Vec2{0, 0})
+	sv.TransformAllLeaves(treff, mat32.V2(1, 1), 0, mat32.V2(0, 0))
 	sv.ViewBox.Size = bsz
 	sv.PhysWidth.Val = bsz.X
 	sv.PhysHeight.Val = bsz.Y