From fa5c57c39fd61257b3491e146a52c9378338b0b0 Mon Sep 17 00:00:00 2001 From: Kai O'Reilly Date: Sat, 13 Apr 2024 23:40:09 -0700 Subject: [PATCH] further renaming of core packages --- examples/rand/README.md | 2 +- slboolview/slboolview.go | 2 +- sledits.go | 2 +- sltype/float.go | 6 +++--- sltype/int.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/rand/README.md b/examples/rand/README.md index 37f510a..505b547 100644 --- a/examples/rand/README.md +++ b/examples/rand/README.md @@ -8,5 +8,5 @@ There is a `//go:generate` comment directive in `main.go` that calls `gosl` on t The generated files go into the `shaders/` subdirectory. -Ignore the type alignment checking errors about Uint2 and Vec2 not being an even multiple of 16 bytes -- we have put in the necessary padding. +Ignore the type alignment checking errors about Uint2 and Vector2 not being an even multiple of 16 bytes -- we have put in the necessary padding. diff --git a/slboolview/slboolview.go b/slboolview/slboolview.go index 4cbae65..365fc3b 100644 --- a/slboolview/slboolview.go +++ b/slboolview/slboolview.go @@ -30,7 +30,7 @@ func (v *BoolValue) Config() { } func (v *BoolValue) Update() { - npv := reflectx.NonPtrValue(v.Value) + npv := reflectx.NonPointerValue(v.Value) sb, ok := npv.Interface().(slbool.Bool) if ok { v.Widget.SetChecked(sb.IsTrue()) diff --git a/sledits.go b/sledits.go index d253ec9..80bc64d 100644 --- a/sledits.go +++ b/sledits.go @@ -150,7 +150,7 @@ var Replaces = []Replace{ {[]byte("slrand."), []byte("Rand")}, {[]byte("sltype.U"), []byte("u")}, {[]byte("sltype.F"), []byte("f")}, - {[]byte(".SetFromVec2("), []byte("=(")}, + {[]byte(".SetFromVector2("), []byte("=(")}, {[]byte(".SetFrom2("), []byte("=(")}, {[]byte(".IsTrue()"), []byte("==1")}, {[]byte(".IsFalse()"), []byte("==0")}, diff --git a/sltype/float.go b/sltype/float.go index 6858fd9..50af6c5 100644 --- a/sltype/float.go +++ b/sltype/float.go @@ -10,10 +10,10 @@ import "cogentcore.org/core/math32" type Float = float32 // Float2 is a length 2 vector of float32 -type Float2 = math32.Vec2 +type Float2 = math32.Vector2 // Float3 is a length 3 vector of float32 -type Float3 = math32.Vec3 +type Float3 = math32.Vector3 // Float4 is a length 4 vector of float32 -type Float4 = math32.Vec4 +type Float4 = math32.Vector4 diff --git a/sltype/int.go b/sltype/int.go index 2368d08..40f9f2e 100644 --- a/sltype/int.go +++ b/sltype/int.go @@ -10,10 +10,10 @@ import "cogentcore.org/core/math32" type Int = int32 // Int2 is a length 2 vector of int32 -type Int2 = math32.Vec2i +type Int2 = math32.Vector2i // Int3 is a length 3 vector of int32 -type Int3 = math32.Vec3i +type Int3 = math32.Vector3i // Int4 is a length 4 vector of int32 type Int4 struct {