From 201a9a4b265248f2b68fa9ea5d90d7e0ff432e48 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 5 Jul 2007 04:56:56 +0000
Subject: [PATCH] Tweaks to visual clip tools

Originally committed to SVN as r1365.
---
 aegisub/spline.cpp                  | 9 ++++++---
 aegisub/visual_tool_clip.cpp        | 2 +-
 aegisub/visual_tool_vector_clip.cpp | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/aegisub/spline.cpp b/aegisub/spline.cpp
index 7ac0d56d5..5f14fd10d 100644
--- a/aegisub/spline.cpp
+++ b/aegisub/spline.cpp
@@ -193,7 +193,7 @@ void Spline::MovePoint(int curveIndex,int point,wxPoint pos) {
 	SplineCurve *c2 = NULL;
 
 	// Indices
-	int size = curves.size();
+	//int size = curves.size();
 	int i0 = curveIndex-1;
 	int i1 = curveIndex;
 	int i2 = curveIndex+1;
@@ -282,8 +282,11 @@ void Spline::GetPointList(std::vector<wxPoint> &points) {
 			int y3 = cur->y3;
 			int y4 = cur->y4;
 
-			// Hardcoded at 50 steps for now
-			int steps = 50;
+			// Find number of steps
+			int len = sqrt(double((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2))) + sqrt(double((x2-x3)*(x2-x3)+(y2-y3)*(y2-y3))) + sqrt(double((x3-x4)*(x3-x4)+(y3-y4)*(y3-y4)));
+			int steps = len/8;
+
+			// Render curve
 			for (int i=0;i<steps;i++) {
 				// Get t and t-1 (u)
 				float t = float(i)/float(steps);
diff --git a/aegisub/visual_tool_clip.cpp b/aegisub/visual_tool_clip.cpp
index 74d66894d..2ba7de1ed 100644
--- a/aegisub/visual_tool_clip.cpp
+++ b/aegisub/visual_tool_clip.cpp
@@ -86,7 +86,7 @@ void VisualToolClip::Draw() {
 	int dy2 = curY2;
 
 	// Draw rectangle
-	SetLineColour(colour[3]);
+	SetLineColour(colour[3],1.0f,2);
 	SetFillColour(colour[3],0.0f);
 	DrawRectangle(dx1,dy1,dx2,dy2);
 
diff --git a/aegisub/visual_tool_vector_clip.cpp b/aegisub/visual_tool_vector_clip.cpp
index fe5091a3d..1063d3157 100644
--- a/aegisub/visual_tool_vector_clip.cpp
+++ b/aegisub/visual_tool_vector_clip.cpp
@@ -68,7 +68,7 @@ void VisualToolVectorClip::Draw() {
 	spline.GetPointList(points);
 
 	// Draw lines
-	SetLineColour(colour[3]);
+	SetLineColour(colour[3],1.0f,2);
 	SetFillColour(colour[3],0.0f);
 	for (size_t i=0;i<points.size()-1;i++) {
 		DrawLine(points[i].x,points[i].y,points[i+1].x,points[i+1].y);
@@ -91,6 +91,7 @@ void VisualToolVectorClip::Draw() {
 	glColorMask(1,1,1,1);
 	glStencilFunc(GL_EQUAL, 0, 1);
 	glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+	SetLineColour(colour[3],0.0f);
 	SetFillColour(wxColour(0,0,0),0.5f);
 	DrawRectangle(0,0,sw,sh);
 	glDisable(GL_STENCIL_TEST);