draw2D, easy: use Origin for origin fields for text also

larpon · Dec 16, 2023 · bf3c6d7 · bf3c6d7
1 parent a011e0f
commit bf3c6d7
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 54 deletions.
diff --git a/easy/easy.api.v b/easy/easy.api.v
@@ -57,8 +57,8 @@ pub mut:
 	rotation f32
 	scale    f32 = 1.0
 	text     string
-	size     f32 = shy.defaults.font.size
-	origin   shy.Anchor
+	size     f32           = shy.defaults.font.size
+	origin   shy.Origin    = shy.Anchor.top_left
 	align    shy.TextAlign = .baseline | .left
 	offset   vec.Vec2[f32]
 	color    shy.Color = shy.rgba(255, 255, 255, 255) // BUG shy.defaults.font.color
@@ -74,8 +74,8 @@ pub mut:
 	rotation f32
 	scale    f32 = 1.0
 	text     string
-	size     f32 = shy.defaults.font.size
-	origin   shy.Anchor
+	size     f32           = shy.defaults.font.size
+	origin   shy.Origin    = shy.Anchor.top_left
 	align    shy.TextAlign = .baseline | .left
 	offset   vec.Vec2[f32]
 	color    shy.Color = shy.defaults.font.color

diff --git a/examples/anchors/anchors.v b/examples/anchors/anchors.v
@@ -34,7 +34,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: shy.half * a.window.width
 		y: shy.half * a.window.height
-		origin: .bottom_center
+		origin: shy.Anchor.bottom_center
 		// align: .left | .bottom
 		offset: vec.vec2[f32](0, -50 - 20)
 		text: 'Current draw anchor:\n${a.anchor}'

diff --git a/examples/anchors/triangle_anchors.v b/examples/anchors/triangle_anchors.v
@@ -71,7 +71,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: a.window.width * 0.01
 		y: a.window.height * (1.0 - 0.01)
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Click mouse left/right to change transform origin
 Origin: ${a.origin}
 Rotation: ${rotation * shy.rad2deg:.1f}°'

diff --git a/examples/animation/animators.v b/examples/animation/animators.v
@@ -97,7 +97,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: a.window.width * 0.01
 		y: a.window.height * (1.0 - 0.01)
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Animation running for ${es:.1f} seconds
 Frame: ${win.state.frame}
 follow at ${a.fa_x.value():.1f},${a.fa_y.value():.1f} running: ${a.fa_x.running}

diff --git a/examples/mouse/mouse.v b/examples/mouse/mouse.v
@@ -35,6 +35,6 @@ pub fn (mut a App) frame(dt f64) {
 		x: mx + 20
 		y: my + 20
 		text: 'Shy Mouse at ${mx},${my}\nButtons pressed: ${buttons}'
-		origin: .top_left
+		origin: shy.Anchor.top_left
 	)
 }
diff --git a/examples/record_and_replay/record_and_replay.v b/examples/record_and_replay/record_and_replay.v
@@ -80,7 +80,7 @@ rect.y ${a.fa_y.value}'
 	a.quick.text(
 		x: a.window.width * 0.01
 		y: a.window.height * 0.01
-		origin: .top_left
+		origin: shy.Anchor.top_left
 		text: text
 	)
 }

diff --git a/examples/render_step/render_step.v b/examples/render_step/render_step.v
@@ -67,7 +67,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: a.window.width * 0.01
 		y: a.window.height * (1.0 - 0.01)
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Press "s" to step 135 frames, hold "s+shift" to go out of step mode.
 Mode: ${win.mode}
 Frame: ${win.state.frame}

diff --git a/examples/render_step/ui_and_manual_mode.v b/examples/render_step/ui_and_manual_mode.v
@@ -49,7 +49,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: a.window.width * 0.01
 		y: a.window.height * (1.0 - 0.01)
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: '${text_manual_render}
 Press "m" to toggle window mode.
 Press "a" to set new animator.

diff --git a/examples/timers/timers.v b/examples/timers/timers.v
@@ -41,21 +41,21 @@ pub fn (mut a App) init() ! {
 		x: shy.half * size.width
 		y: shy.half * size.height
 		size: 50
-		origin: .center
+		origin: shy.Anchor.center
 		align: .center
 	)
 
 	a.info_text = a.easy.new_text(
 		x: shy.half * size.width
 		y: 10
-		origin: .top_center
+		origin: shy.Anchor.top_center
 		align: .center
 		text: info
 	)
 
 	a.clock_text = a.easy.new_text(
 		y: size.height
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Local time: ${time.now().format_ss()}'
 	)
 

diff --git a/lib/draw2d.text.b.v b/lib/draw2d.text.b.v
@@ -129,9 +129,9 @@ mut:
 pub mut:
 	text     string
 	rotation f32
-	font     string = defaults.font.name
-	color    Color  = defaults.font.color
-	origin   Anchor
+	font     string    = defaults.font.name
+	color    Color     = defaults.font.color
+	origin   Origin    = Anchor.top_left
 	align    TextAlign = .baseline | .left // TODO V BUG lib.defaults.font.align
 	size     f32       = defaults.font.size
 	scale    f32       = 1.0
@@ -140,6 +140,45 @@ pub mut:
 	blur     f32
 }
 
+/*
+fn calculate_text_offset_from_anchor(anchor Anchor, max_w f32, max_h f32) ( f32, f32) {
+	mut off_x := f32(0)
+	mut off_y := f32(0)
+	match anchor {
+			.top_left {}
+			.top_center {
+				off_x = -(max_w / 2)
+			}
+			.top_right {
+				off_x = -max_w
+			}
+			.center_left {
+				off_y = -(max_h / 2)
+			}
+			.center {
+				off_x = -(max_w / 2)
+				off_y = -(max_h / 2)
+			}
+			.center_right {
+				off_x = -max_w
+				off_y = -(max_h / 2)
+			}
+			.bottom_left {
+				off_y = -max_h
+			}
+			.bottom_center {
+				off_x = -(max_w / 2)
+				off_y = -max_h
+			}
+			.bottom_right {
+				off_x = -max_w
+				off_y = -max_h
+			}
+	}
+	return off_x, off_y
+}
+*/
+
 @[inline]
 pub fn (t Draw2DText) draw() {
 	// http://www.freetype.org/freetype2/docs/tutorial/metrics.png
@@ -243,37 +282,12 @@ pub fn (t Draw2DText) draw() {
 			0
 		}
 		off_x += align_off_x
-		match t.origin {
-			.top_left {}
-			.top_center {
-				off_x += -(max_w / 2)
-			}
-			.top_right {
-				off_x += -max_w
-			}
-			.center_left {
-				off_y += -(max_h / 2)
-			}
-			.center {
-				off_x += -(max_w / 2)
-				off_y += -(max_h / 2)
-			}
-			.center_right {
-				off_x += -max_w
-				off_y += -(max_h / 2)
-			}
-			.bottom_left {
-				off_y += -max_h
-			}
-			.bottom_center {
-				off_x += -(max_w / 2)
-				off_y += -max_h
-			}
-			.bottom_right {
-				off_x += -max_w
-				off_y += -max_h
-			}
-		}
+
+		o_off_x, o_off_y := t.origin.pos_wh(max_w, max_h)
+
+		off_x += -o_off_x
+		off_y += -o_off_y
+
 		y_accu += prev_line_height
 		prev_line_height = line_height - 2 // lines.len
 

diff --git a/tests/visual/easy_mixed_drawing.v b/tests/visual/easy_mixed_drawing.v
@@ -60,7 +60,7 @@ pub fn (mut a App) frame(dt f64) {
 		x: win_w
 		y: win_h
 		text: 'Shy Test!'
-		origin: .bottom_right
+		origin: shy.Anchor.bottom_right
 	)
 
 	a.quick.line_segment(
@@ -96,7 +96,7 @@ pub fn (mut a App) frame(dt f64) {
 		x: (win_w * 0.25)
 		y: (win_h * 0.75)
 		text: 'Shy'
-		origin: .center
+		origin: shy.Anchor.center
 	)
 
 	a.quick.rect(

diff --git a/tests/visual/image_fill_modes.v b/tests/visual/image_fill_modes.v
@@ -172,7 +172,7 @@ pub fn (mut a App) live_frame(dt f64) {
 		y: a.canvas().height
 		// width: rw
 		// height: rh
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Image (n/m): ${images[a.image]}
 Origin (up/down): ${a.origin}
 FillMode (left/right): ${a.fill_mode}'

diff --git a/tests/visual/rectangle_rounded.v b/tests/visual/rectangle_rounded.v
@@ -120,7 +120,7 @@ pub fn (mut a App) live_frame(dt f64) {
 
 	a.quick.text(
 		y: a.canvas().height
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Press "D" to change dimensions
 Origin (up/down): ${a.origin}
 Dimensions ${a.dimension}x${a.dimension}'

diff --git a/tests/visual/triangles.v b/tests/visual/triangles.v
@@ -53,7 +53,7 @@ pub fn (mut a App) frame(dt f64) {
 		a: center
 		b: center + shy.vec2(f32(50), -50) // TODO origin bug
 		c: center + shy.vec2(f32(100), 0)
-		origin: .center
+		origin: shy.Anchor.center
 	)*/
 
 	origin := a.origin // shy.Anchor.top_center
@@ -131,7 +131,7 @@ pub fn (mut a App) frame(dt f64) {
 	a.quick.text(
 		x: a.canvas().width * 0.01
 		y: a.canvas().height * (1.0 - 0.01)
-		origin: .bottom_left
+		origin: shy.Anchor.bottom_left
 		text: 'Click mouse left/right to change transform origin
 Origin: ${a.origin}'
 	)